[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (6352d3b4b03bf3210204704dbcc239d1fcff56fb)

Jaka Kranjc scm at mail.sourcemage.org
Mon Jan 8 14:26:11 EST 2007


GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 smgl/init.d/CONFIGURE |    6 +++++-
 smgl/init.d/HISTORY   |    3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 6352d3b4b03bf3210204704dbcc239d1fcff56fb
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    fix #9772 for good

diff --git a/smgl/init.d/CONFIGURE b/smgl/init.d/CONFIGURE
index 87a39d9..eba18bb 100755
--- a/smgl/init.d/CONFIGURE
+++ b/smgl/init.d/CONFIGURE
@@ -16,7 +16,11 @@ if  grep -q devfs /proc/filesystems  &&
   message "\n${MESSAGE_COLOR}NOTICE: Switching from devfs to udev or static currently needs manual editing of /etc/fstab.${DEFAULT_COLOR}\n"
 fi  &&
 
-config_query_list  DEVICES  "Choose /dev management mode:"  $DEVICE ${DEVICES_LIST/ $DEVICE/} &&
+# default to the previously selected option #9772 - only a problem on the very
+# second cast. Adding it to the start of the list makes it the default in
+# the next query.
+. /etc/sysconfig/devices &&
+config_query_list DEVICES "Choose /dev management mode:" $DEVICES ${DEVICES_LIST/$DEVICES/}
 if [[ "$DEVICES" != "devfs" ]]
 then
   config_query  CREATE_DEV_TREE  "check for/create static /dev tree" y
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index 87b02a0..9bde5b8 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,5 +1,6 @@
 2007-01-08 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
-	* CONFIGURE: added missing &&
+	* CONFIGURE: fix #9772, restore the DEVICE settings for the second cast
+	  added missing &&
 
 2006-12-19 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* init.d/mountall.sh: added no9p to not mount 9p resource sharers



More information about the SM-Commit mailing list