Author: titmuss
Date: Fri Dec 19 14:06:37 2008
New Revision: 3586
URL: http://svn.slimdevices.com?rev=3586&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3585): titmuss | 2008-12-19 21:52:28 +0000
Bug: N/A
Description:
Allow factory reset to be requested from the kernel command line.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Dec 19 14:06:37 2008
@@ -3,7 +3,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3550
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3579
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3585
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc?rev=3586&root=Jive&r1=3585&r2=3586&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
(original)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/files/linuxrc
Fri Dec 19 14:06:37 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/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb?rev=3586&root=Jive&r1=3585&r2=3586&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
(original)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
Fri Dec 19 14:06:37 2008
@@ -3,7 +3,7 @@
PRIORITY = "required"
LICENSE = "GPL"
-PR = "r18"
+PR = "r21"
SRC_URI = " \
file://85-mtd.rules \
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
