diff options
author | Dirk von Suchodoletz | 2007-04-07 13:47:42 +0200 |
---|---|---|
committer | Dirk von Suchodoletz | 2007-04-07 13:47:42 +0200 |
commit | 7d9c88e8c36e75a4a28c33d76a1808eb020513bd (patch) | |
tree | 53027460775491d7edf9f6ba1fdbe37ff40491b4 /initramfs/distro-specs | |
parent | Added packages to support nbd/squash exports in SuSE10.2 (nbd is present (diff) | |
download | core-7d9c88e8c36e75a4a28c33d76a1808eb020513bd.tar.gz core-7d9c88e8c36e75a4a28c33d76a1808eb020513bd.tar.xz core-7d9c88e8c36e75a4a28c33d76a1808eb020513bd.zip |
The acpi/powersaved heavily depend on dbus (on SuSE 10++ systems),
cleanup in functions scripts, reordering, switching on if acpi is used
...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@869 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/distro-specs')
-rw-r--r-- | initramfs/distro-specs/suse/functions-10.0 | 6 | ||||
-rw-r--r-- | initramfs/distro-specs/suse/functions-10.1 | 6 | ||||
-rw-r--r-- | initramfs/distro-specs/suse/functions-10.2 | 18 | ||||
-rw-r--r-- | initramfs/distro-specs/suse/functions-default | 17 |
4 files changed, 19 insertions, 28 deletions
diff --git a/initramfs/distro-specs/suse/functions-10.0 b/initramfs/distro-specs/suse/functions-10.0 index e35bad5e..7151c9c0 100644 --- a/initramfs/distro-specs/suse/functions-10.0 +++ b/initramfs/distro-specs/suse/functions-10.0 @@ -22,12 +22,6 @@ fi return $result } -# acpi and powersave -config_acpi () { -rllinker acpid "10" "12" -rllinker powersaved "11" "11" -} - # prepare virtual machine environment (vmware, vmplayer) config_vmware () { rllinker "vmware-prep" "18" "02" diff --git a/initramfs/distro-specs/suse/functions-10.1 b/initramfs/distro-specs/suse/functions-10.1 index 604f3d84..5294c313 100644 --- a/initramfs/distro-specs/suse/functions-10.1 +++ b/initramfs/distro-specs/suse/functions-10.1 @@ -41,12 +41,6 @@ fi return $result } -# acpi and powersave -config_acpi () { -rllinker acpid "10" "12" -rllinker powersaved "11" "11" -} - # afs client # configure afs client config_afs () { diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2 index 4c2d32ff..bc2c18eb 100644 --- a/initramfs/distro-specs/suse/functions-10.2 +++ b/initramfs/distro-specs/suse/functions-10.2 @@ -58,12 +58,6 @@ fi return $result } -# acpi and powersave -config_acpi () { -rllinker acpid "10" "12" -rllinker powersaved "11" "11" -} - # configure dbus (inter application communication for kde and gnome), hal # (hardware abstraction layer - used e.g. by powersaved), resmgr and # policykitd (resource manager/policykitd - the user gets permissions to @@ -86,14 +80,14 @@ if [ "x$start_dreshal" = "xyes" ]; then fi if [ -f /mnt/etc/${D_INITDIR}/resmgr ] ; then testmkd /mnt/var/run/resmgr/classes - start="0"`expr $start + 1` - stop="0"`expr $start - 1` + start="0"$(expr $start + 1) + stop="0"$(expr $start - 1) rllinker "resmgr" "$start" "$stop" fi if [ -f /mnt/etc/${D_INITDIR}/policykitd ] ; then testmkd /mnt/var/run/polkit - start="0"`expr $start + 1` - stop="0"`expr $start - 1` + start="0"$(expr $start + 1) + stop="0"$(expr $start - 1) rllinker "policykitd" "$start" "$stop" fi if [ -f /mnt/etc/${D_INITDIR}/haldaemon ] ; then @@ -106,8 +100,8 @@ if [ "x$start_dreshal" = "xyes" ]; then # set permissions with userid echo -e "\tchown haldaemon:haldaemon /var/run/hal 2>/dev/null" \ >>/mnt/etc/${D_INITDIR}/boot.slx - start="0"`expr $start + 1` - stop="0"`expr $start - 1` + start="0"$(expr $start + 1) + stop="0"$(expr $start - 1) rllinker "haldaemon" "$start" "$stop" fi fi diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default index 92a032f5..a072a493 100644 --- a/initramfs/distro-specs/suse/functions-default +++ b/initramfs/distro-specs/suse/functions-default @@ -357,6 +357,15 @@ sed -e "s,RC_LANG=.*,RC_LANG=\"${LANG}\" # added in initrd," \ -i /mnt/etc/${D_SYSCONFDIR}/language } +# acpi and powersave daemons, required e.g. to shutdown the machine via +# power button, no need for early start +config_acpi () { +rllinker acpid "22" "12" +rllinker powersaved "23" "11" +# dbus is required to run acpid and powersaved +start_dreshal="yes" +} + # 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) @@ -379,8 +388,8 @@ if [ "x$start_dreshal" = "xyes" ]; then fi if [ -f /mnt/etc/${D_INITDIR}/resmgr ] ; then testmkd /mnt/var/run/resmgr/classes - start="0"`expr $start + 1` - stop="0"`expr $start - 1` + start="0"$(expr $start + 1) + stop="0"$(expr $start - 1) rllinker "resmgr" "$start" "$stop" fi if [ -f /mnt/etc/${D_INITDIR}/haldaemon ] ; then @@ -393,8 +402,8 @@ if [ "x$start_dreshal" = "xyes" ]; then # set permissions with userid echo -e "\tchown haldaemon:haldaemon /var/run/hal 2>/dev/null" \ >>/mnt/etc/${D_INITDIR}/boot.slx - start="0"`expr $start + 1` - stop="0"`expr $start - 1` + start="0"$(expr $start + 1) + stop="0"$(expr $start - 1) rllinker "haldaemon" "$start" "$stop" fi fi |