[maemo-commits] [maemo-commits] r16933 - in projects/haf/trunk/ke-recv: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2008-12-10 15:51:00 +0200 (Wed, 10 Dec 2008)
New Revision: 16933

Modified:
   projects/haf/trunk/ke-recv/debian/changelog
   projects/haf/trunk/ke-recv/src/fremantle-format-internal-memory-card.sh
   projects/haf/trunk/ke-recv/src/ke-recv.c
   projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-enable.sh
Log:
changes in partitioning scheme


Modified: projects/haf/trunk/ke-recv/debian/changelog
===================================================================
--- projects/haf/trunk/ke-recv/debian/changelog	2008-12-10 13:00:05 UTC (rev 16932)
+++ projects/haf/trunk/ke-recv/debian/changelog	2008-12-10 13:51:00 UTC (rev 16933)
@@ -1,3 +1,11 @@
+ke-recv (3.5-1~unreleased) unstable; urgency=low
+
+  * Fourth partition is now FAT.
+  * Send TERM to pnatd before trying to remove g_nokia.
+  * Updated the unofficial partitioning script for internal memory card.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 10 Dec 2008 14:59:10 +0200
+
 ke-recv (3.4-1) unstable; urgency=low
 
   * Fix segfaulting ULOG_DEBUG_F calls.

Modified: projects/haf/trunk/ke-recv/src/fremantle-format-internal-memory-card.sh
===================================================================
--- projects/haf/trunk/ke-recv/src/fremantle-format-internal-memory-card.sh	2008-12-10 13:00:05 UTC (rev 16932)
+++ projects/haf/trunk/ke-recv/src/fremantle-format-internal-memory-card.sh	2008-12-10 13:51:00 UTC (rev 16933)
@@ -29,14 +29,16 @@
 umount ${1}p1
 umount ${1}p2
 umount ${1}p3
+umount ${1}p4
 
 sfdisk -D -uM $1 << EOF
 ,768,S
+,4,L
 ,2048,L
 ,,b
 EOF
 
-mkdosfs -F 32 -R 38 ${1}p3
+mkdosfs -F 32 -R 38 ${1}p4
 
 sync
 

Modified: projects/haf/trunk/ke-recv/src/ke-recv.c
===================================================================
--- projects/haf/trunk/ke-recv/src/ke-recv.c	2008-12-10 13:00:05 UTC (rev 16932)
+++ projects/haf/trunk/ke-recv/src/ke-recv.c	2008-12-10 13:51:00 UTC (rev 16933)
@@ -1519,7 +1519,7 @@
                 mmc->swap_off_op = INTERNAL_MMC_SWAP_OFF_OP;
 
 #ifdef FREMANTLE_MODE
-                mmc->preferred_volume = 3;
+                mmc->preferred_volume = 4;
                 mmc->control_partitions = 0;
 #else
                 mmc->preferred_volume = 1;

Modified: projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-enable.sh
===================================================================
--- projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-enable.sh	2008-12-10 13:00:05 UTC (rev 16932)
+++ projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-enable.sh	2008-12-10 13:51:00 UTC (rev 16933)
@@ -24,6 +24,9 @@
 /sbin/lsmod | grep g_nokia > /dev/null
 if [ $? = 0 ]; then
     echo "$0: removing g_nokia"
+    # kill pnatd to make it release its grip on g_nokia
+    kill `pidof pnatd`
+    sleep 1
     /sbin/rmmod g_nokia
 fi