Author: titmuss
Date: Fri Dec 19 13:52:28 2008
New Revision: 3585
URL: http://svn.slimdevices.com?rev=3585&root=Jive&view=rev
Log:
Bug: N/A
Description:
Allow factory reset to be requested from the kernel command line.
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc?rev=3585&root=Jive&r1=3584&r2=3585&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
Fri Dec 19 13:52:28 2008
@@ -26,8 +26,11 @@
/bin/mount -t ${MOUNT_TYPE} -o noatime ${MOUNT_DEVICE} /mnt/storage
MOUNT_OK=$?
+/bin/grep -q factoryreset /proc/cmdline
+FACTORY_RESET=$?
+
# Factory reset
-if [ $MOUNT_OK -ne 0 -o -f /mnt/storage/.factoryreset ]
+if [ $MOUNT_OK -ne 0 -o -f /mnt/storage/.factoryreset -o $FACTORY_RESET ]
then
/bin/echo "Factory Reset"
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb?rev=3585&root=Jive&r1=3584&r2=3585&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
Fri Dec 19 13:52:28 2008
@@ -3,7 +3,7 @@
PRIORITY = "required"
LICENSE = "GPL"
-PR = "r17"
+PR = "r21"
SRC_URI = " \
file://85-mtd.rules \
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
