diff options
author | Dirk von Suchodoletz | 2006-01-26 15:45:10 +0100 |
---|---|---|
committer | Dirk von Suchodoletz | 2006-01-26 15:45:10 +0100 |
commit | b18db638acc907a485a704caa717c62d5b47ba2c (patch) | |
tree | 29b489a6e91b68e6237c6aaf328d335d01f5f2ea | |
parent | Libraryabhängigkeiten für nfs und kleinere Bugfixes (diff) | |
download | core-b18db638acc907a485a704caa717c62d5b47ba2c.tar.gz core-b18db638acc907a485a704caa717c62d5b47ba2c.tar.xz core-b18db638acc907a485a704caa717c62d5b47ba2c.zip |
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
-rw-r--r-- | initrd/distro-specs/suse/functions-10.0 | 37 | ||||
-rw-r--r-- | initrd/distro-specs/suse/functions-9.3 | 14 | ||||
-rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 4 |
3 files changed, 44 insertions, 11 deletions
diff --git a/initrd/distro-specs/suse/functions-10.0 b/initrd/distro-specs/suse/functions-10.0 index 86fd53b0..eee06b52 100644 --- a/initrd/distro-specs/suse/functions-10.0 +++ b/initrd/distro-specs/suse/functions-10.0 @@ -13,11 +13,44 @@ # acpi and powersave have changed config_acpi () { -local start_acpi=$1 -local stop_acpi=$2 +local start_acpi=10 +local stop_acpi=12 local start_powersave=`expr $1 + 5` local stop_powersave=`expr $1 - 1` rllinker acpid "$start_acpi" "$stop_acpi" rllinker powersaved "$start_powersave" "$stop_powersave" } +# configure dbus (inter application communication for kde and gnome), hal +# (hardware abstraction layer - used e.g. by powersaved) and resmgr +# (resource manager - the user gets permissions to devices when loggin on) +# runlevel script for haldaemon is now haldaemon instead of hal +config_dreshal () { +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 || \ + echo "messagebus:x:100:101:User for D-BUS:/var/run/dbus:/bin/false" \ + >> /mnt/etc/passwd + testmkd /mnt/var/run/dbus + # chown 100:101 /mnt/var/run/dbus + rllinker "dbus" "$start" "$stop" + fi + if [ -f /mnt/etc/init.d/resmgr ] ; then + testmkd /mnt/var/run/resmgr/classes + start="0"`expr $start + 1` + stop="0"`expr $start - 1` + rllinker "resmgr" "$start" "$stop" + fi + if [ -f /mnt/etc/init.d/hal ] ; then + strinfile "haldaemon:" /mnt/etc/passwd || \ + 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 "hal" "$start" "$stop" + fi +fi +} + 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 } diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index 92c4a232..331b449d 100755 --- a/initrd/initrd-stuff/bin/servconfig +++ b/initrd/initrd-stuff/bin/servconfig @@ -137,10 +137,10 @@ config_syslog "02" "20" # configure dbus - distro dependent function config_dreshal - handle all # stuff regarding dependent services like dbus, resmgr, hal ... # (check for runlevel scripts, passwd entries, directories ...) -config_dreshal "03" "18" +config_dreshal # acpi and powersave - distro dependent function config_acpi -config_acpi "10" "12" +config_acpi ####################################################################### # network(ed) services |