hal and haldaemon differences in SuSE 9.3 and 10. Do not give start and

stop in servconfig but the functions directly instead.



git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@43 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 7 insertions, 7 deletions

diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3
index 80018de4..88fa7f59 100644
--- a/initrd/distro-specs/suse/functions-9.3
+++ b/initrd/distro-specs/suse/functions-9.3
@@ -318,8 +318,8 @@ echo -e "\tsetfont ${CONSOLE_FONT} >${LOGFILE} 2>&1\n" \
 
 # acpi and powersave
 config_acpi () {
-  local start_powersave=`expr $1 + 5`
-  local stop_powersave=`expr $1 - 1`
+  local start_powersave=10
+  local stop_powersave=12
   rllinker powersaved "$start_powersave" "$stop_powersave"
 }
 
@@ -327,8 +327,8 @@ config_acpi () {
 # (hardware abstraction layer - used e.g. by powersaved) and resmgr
 # (resource manager - the user gets permissions to devices when loggin on)
 config_dreshal () {
-local start="$1"
-local stop="$2"
+local start="05"
+local stop="18"
 if [ "x$start_dreshal" = "xyes" ]; then
   if [ -f /mnt/etc/init.d/dbus ] ; then
   strinfile "messagebus:" /mnt/etc/passwd || \
@@ -344,13 +344,13 @@ if [ "x$start_dreshal" = "xyes" ]; then
     stop="0"`expr $start - 1`
     rllinker "resmgr" "$start" "$stop"
   fi
-  if [ -f /mnt/etc/init.d/haldaemon ] ; then
+  if [ -f /mnt/etc/init.d/hal ] ; then
     strinfile "haldaemon:" /mnt/etc/passwd || \
-      echo "haldaemon:x:101:102:User for haldaemon:/var/run/hal:/bin/false" \
+      echo "haldaemon:x:105:103:User for haldaemon:/var/run/hal:/bin/false" \
         >> /mnt/etc/passwd
     start="0"`expr $start + 1`
     stop="0"`expr $start - 1`
-    rllinker "haldaemon" "$start" "$stop"
+    rllinker "hal" "$start" "$stop"
   fi
 fi
 }