X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_sbin%2Fgrml-setservices;h=633ea9bc77e5b6b76aee8188952d1ac9d740b15b;hb=a2efc1f258eaa529e455ae31b48795f0f3c0329f;hp=3da57283a7414c24f186a192ed1798914f842be8;hpb=bb67bf09d23d4e56cf5cbb25ab469600311bce2c;p=grml-scripts-core.git

diff --git a/usr_sbin/grml-setservices b/usr_sbin/grml-setservices
index 3da5728..633ea9b 100755
--- a/usr_sbin/grml-setservices
+++ b/usr_sbin/grml-setservices
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mit Jul 18 02:16:12 CEST 2007 [mika]
 ################################################################################
 
 PN="$(basename $0)"
@@ -22,7 +21,7 @@ bailout(){
   exit 0
 }
 
-trap bailout 1 2 3 15
+trap bailout SIGHUP SIGINT SIGQUIT SIGTERM
 
 is_value_set(){
  [ -n "$1" ] || return 2
@@ -45,6 +44,7 @@ or choose cancel.
 [ -r /etc/init.d/mdadm ]  && SRAID='mdadm!software-raid via mdadm!on'
 [ -r /etc/init.d/dmraid ] && MRAID='dmraid!software-raid via dmraid!off'
 [ -r /etc/init.d/dbus -o -r /etc/init.d/dbus-1 ] && DBUS='dbus!hal/dbus (important for KDE e.g.)!off'
+[ -r /etc/init.d/hal ]    && HAL='hal!Hardware Abstraction Layer daemon (important for KDE e.g.)!off'
 [ -r /etc/init.d/nfs-common ] && NFS='nfs!Network File System (client setup)!off'
 
 ## adjust setup
@@ -99,6 +99,16 @@ set_values(){
      fi
   fi
 
+  if [ -n "$HAL" ] ; then
+     if is_value_set "hal" ; then
+        update-rc.d -f hal remove >/dev/null 2>&1
+        update-rc.d hal start 24 2 3 4 5. stop 16 0 1 6 . >/dev/null 2>&1
+     else
+        update-rc.d -f hal remove >/dev/null 2>&1
+        update-rc.d hal stop 20 0 1 6 . >/dev/null 2>&1
+     fi
+  fi
+
   if [ -n "$NFS" ] ; then
      if is_value_set "nfs" ; then
         update-rc.d -f nfs-common remove >/dev/null 2>&1
@@ -113,7 +123,7 @@ set_values(){
 # the interface itself
 oifs="$IFS"
 IFS='!'
-$DIALOG --title "$PN" --checklist "$INFO" 30 65 8 $LVM $SRAID $MRAID $DBUS $NFS 2>$TMP
+$DIALOG --title "$PN" --checklist "$INFO" 30 65 8 $LVM $SRAID $MRAID $DBUS $HAL $NFS 2>$TMP
 
 retval="$?"
 case $retval in