[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (6e52ce476324dd3945f3f672512a5906e0de19ea)

Jaka Kranjc scm at mail.sourcemage.org
Mon Jan 8 14:09:54 EST 2007


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

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

New commits:
commit 6e52ce476324dd3945f3f672512a5906e0de19ea
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    Revert "init.d: fix #9772"
    
    This reverts commit 0c5bb2346e9f386b0d8126aba7c86a8702fcc738.
    
    oh well

diff --git a/smgl/init.d/CONFIGURE b/smgl/init.d/CONFIGURE
index bd052c7..87a39d9 100755
--- a/smgl/init.d/CONFIGURE
+++ b/smgl/init.d/CONFIGURE
@@ -16,12 +16,7 @@ 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  &&
 
-# default to the previously selected option #9772 - only a problem on the very
-# second cast. persistant_add-ing the variable will make it be the default in
-# the next query, even though it may seem redundant
-persistent_add DEVICES &&
-. /etc/sysconfig/devices &&
-config_query_list  DEVICES  "Choose /dev management mode:"  $DEVICES_LIST &&
+config_query_list  DEVICES  "Choose /dev management mode:"  $DEVICE ${DEVICES_LIST/ $DEVICE/} &&
 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 9bde5b8..87b02a0 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,6 +1,5 @@
 2007-01-08 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
-	* CONFIGURE: fix #9772, restore the DEVICE settings for the second cast
-	  added missing &&
+	* CONFIGURE: 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