Source Mage code commit list

[Andraž Levstik <scm AT sourcemage.org>]

GIT changes to master grimoire by Andraž Levstik <ruskie AT codemages.net>:

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

New commits:
commit 106ff713ba155090d65a80e45b51d91b965caddd
Author: Andraž Levstik <ruskie AT codemages.net>
Commit: Andraž Levstik <ruskie AT codemages.net>

    init.d: fixed CONFIGURE to use the right function

diff --git a/smgl/init.d/CONFIGURE b/smgl/init.d/CONFIGURE
index 8cd60ac..59446b6 100755
--- a/smgl/init.d/CONFIGURE
+++ b/smgl/init.d/CONFIGURE
@@ -2,9 +2,9 @@
 
 local  DEVICES_LIST  &&
 
-if  [[ $(get_sorcery_kernel_config CONFIG_NET) == y  &&
-       $(get_sorcery_kernel_config CONFIG_UNIX) == y  &&
-       $(get_sorcery_kernel_config CONFIG_HOTPLUG) == y ]]; then
+if  [[ $(get_running_kernel_config CONFIG_NET) == y  &&
+       $(get_running_kernel_config CONFIG_UNIX) == y  &&
+       $(get_running_kernel_config CONFIG_HOTPLUG) == y ]]; then
   DEVICES_LIST="udev static static_udev"
 else
   DEVICES_LIST="static"
@@ -13,7 +13,8 @@ fi  &&
 if  grep -q devfs /proc/filesystems  &&
     [[ -e /dev/.devfsd ]]; then
   DEVICES_LIST="$DEVICES_LIST devfs"  &&
-  message "\n${MESSAGE_COLOR}NOTICE: Switching from devfs to udev or static 
currently needs manual editing of /etc/fstab.${DEFAULT_COLOR}\n"
+  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
@@ -22,7 +23,8 @@ fi  &&
 if [[ -f $INSTALL_ROOT/etc/sysconfig/devices ]]; then
   . $INSTALL_ROOT/etc/sysconfig/devices 
 fi &&
-config_query_list DEVICES "Choose /dev management mode:" $DEVICES 
${DEVICES_LIST/$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 3837613..382dfe3 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,7 +1,8 @@
 2009-02-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * init.d/devices: added static_udev option
        * init.d/devices.conf: added static_udev option
-       * CONFIGURE: added static_udev option
+       * CONFIGURE: added static_udev option, use the correct function
+         to check for kernel options, lines should be 80 chars or less
        * DETAILS: 2.2.6
 
 2008-12-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>