From 20ed426e83b3e5d3bca8268f00cef7de4a881d01 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Mon, 28 Nov 2011 15:12:49 +0100
Subject: test systemd kdm startup script

---
 src/initramfs/distro-specs/suse/functions-12.1 | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/initramfs')

diff --git a/src/initramfs/distro-specs/suse/functions-12.1 b/src/initramfs/distro-specs/suse/functions-12.1
index 3b05ca2d..5f11e0a3 100644
--- a/src/initramfs/distro-specs/suse/functions-12.1
+++ b/src/initramfs/distro-specs/suse/functions-12.1
@@ -57,7 +57,7 @@ local script="$1"
 if [ -f /mnt/etc/systemd/system/${script}.service ]; then
   ln -sf /etc/systemd/system/${script}.service \
          /mnt/etc/systemd/system/default.target.wants/${script}.service
-else if [ -f /mnt/lib/systemd/system/${script}.service ]; then
+elif [ -f /mnt/lib/systemd/system/${script}.service ]; then
   ln -sf /lib/systemd/system/${script}.service \
          /mnt/etc/systemd/system/default.target.wants/${script}.service
 fi
@@ -68,15 +68,17 @@ fi
 config_portmap () {
 # portmap is provided via rpcbind in suse 11.1,2,3,4 and 12.1
 testmkd /mnt/var/lib/rpcbind
-rllinker "rpcbind" 4 5
+rllinker "rpcbind"
 }
+
 # 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 acpid
 # 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)
 config_dreshal () {
@@ -92,7 +94,6 @@ if [ "x$start_dreshal" = "xyes" ]; then
   touch /mnt/var/lib/misc/PolicyKit.reload
   chown polkituser.polkituser /mnt/var/lib/misc/PolicyKit.reload
 
-  if [ -f /mnt/etc/init.d/dbus ] ; then
     strinfile "messagebus:" /mnt/etc/passwd || \
       echo "messagebus:x:102:103:User for D-BUS:/var/run/dbus:/bin/false" \
         >> /mnt/etc/passwd
@@ -103,10 +104,10 @@ if [ "x$start_dreshal" = "xyes" ]; then
            /mnt/etc/dbus-1/system.d/nm-*
 
     rllinker "dbus" 1 20
-  fi
 fi
 }
 # function for ntp configuration
+#TODO: ntp we need a systemd startup script
 config_ntp () {
 if [ -e /mnt/etc/init.d/ntp ] ; then
   if ! strinfile "ntp:" /mnt/etc/passwd ; then
@@ -118,7 +119,7 @@ if [ -e /mnt/etc/init.d/ntp ] ; then
   testmkd /mnt/var/db
   touch /mnt/var/db/ntp-kod
   if [ "x$start_ntp" = "xyes" ] ; then
-    rllinker "ntp" 2 14
+    rllinker "ntp"
   fi
 fi
 }
-- 
cgit v1.2.3-55-g7522