Author: titmuss
Date: Wed Sep  3 04:55:10 2008
New Revision: 2896

URL: http://svn.slimdevices.com?rev=2896&root=Jive&view=rev
Log:
Bug: N/A
Description:
Improvements to init scripts, to allow experimentation with different flash 
partitions and 
platforms.


Modified:
    7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/inittab
    7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
    
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb

Modified: 
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/inittab
URL: 
http://svn.slimdevices.com/7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/inittab?rev=2896&root=Jive&r1=2895&r2=2896&view=diff
==============================================================================
--- 7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/inittab 
(original)
+++ 7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/inittab 
Wed Sep  3 04:55:10 2008
@@ -1,2 +1,2 @@
 ::sysinit:/etc/init.d/rcS
-tts/0::askfirst:/bin/sh
+::askfirst:/bin/sh

Modified: 
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
URL: 
http://svn.slimdevices.com/7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc?rev=2896&root=Jive&r1=2895&r2=2896&view=diff
==============================================================================
--- 7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc 
(original)
+++ 7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc 
Wed Sep  3 04:55:10 2008
@@ -14,7 +14,11 @@
 /sbin/mdev -s
 
 # Mount read/write filesystem
-/bin/mount -t jffs2 -o noatime /dev/mtdblock/2 /mnt/storage
+JFFS2_DEV=`grep jffs2 /proc/mtd | cut -c4`
+JFFS2_MTD=/dev/mtd/${JFFS2_DEV}
+JFFS2_MTDBLOCK=/dev/mtdblock/${JFFS2_DEV}
+
+/bin/mount -t jffs2 -o noatime ${JFFS2_MTDBLOCK} /mnt/storage
 JFFS2_OK=$?
 
 # Factory reset
@@ -23,8 +27,8 @@
        /bin/echo "Factory Reset"
 
        /bin/umount /mnt/storage
-       /usr/sbin/flash_eraseall -q /dev/mtd/2
-       /bin/mount -t jffs2 -o noatime /dev/mtdblock/2 /mnt/storage
+       /usr/sbin/flash_eraseall -q ${JFFS2_MTD}
+       /bin/mount -t jffs2 -o noatime ${JFFS2_MTDBLOCK} /mnt/storage
 else
        # Upgraded?
        /usr/bin/diff -N /etc/squeezeos.version 
/mnt/storage/etc/squeezeos.version > /dev/null 2> /dev/null

Modified: 
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
URL: 
http://svn.slimdevices.com/7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb?rev=2896&root=Jive&r1=2895&r2=2896&view=diff
==============================================================================
--- 
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
 (original)
+++ 
7.3/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
 Wed Sep  3 04:55:10 2008
@@ -3,7 +3,7 @@
 PRIORITY = "required"
 LICENSE = "GPL"
 
-PR = "r10"
+PR = "r12"
 
 SRC_URI = " \
        file://config \

_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins

Reply via email to