Changes on SuSE 11.4 to re-enable device access (hopefully) ...

1 files changed, 16 insertions, 30 deletions

diff --git a/src/initramfs/distro-specs/suse/functions-11.4 b/src/initramfs/distro-specs/suse/functions-11.4
index 6335bb69..9c771782 100644
--- a/src/initramfs/distro-specs/suse/functions-11.4
+++ b/src/initramfs/distro-specs/suse/functions-11.4
@@ -31,6 +31,7 @@ for dir in rc0.d rc1.d rc2.d rc3.d rc4.d rc5.d rc6.d boot.d ; do
   rm -rf /mnt/etc/init.d/${dir}/*
 done
 touch /mnt/var/log/btmp
+touch /mnt/var/log/lastlog
 }
 
 # start portmapper (needed at least for nfs and nis services)
@@ -52,10 +53,11 @@ config_dreshal () {
 local start=1
 local stop=10
 if [ "x$start_dreshal" = "xyes" ]; then
-  for dir in /var/lib/misc /var/run/ConsoleKit \
-             "/var/run/PolicyKit polkituser:polkituser" \
-             "/var/lib/PolicyKit polkituser:polkituser" \
-             "/var/run/dbus/at_console/pool"; do
+  # create directories and set permissions with user and group id
+  for dir in "/var/lib/misc" "/var/run/ConsoleKit" \
+             "/var/lib/dbus" \
+             "/var/lib/polkit-1/localauthority" \
+             "/var/run/dbus messagebus:messagebus"; do
     testmkd /mnt${dir}
   done
 
@@ -65,37 +67,21 @@ if [ "x$start_dreshal" = "xyes" ]; then
         >> /mnt/etc/passwd
     strinfile "messagebus:" /mnt/etc/group || \
       echo "messagebus:!:103:" >> /mnt/etc/group
-	# create directories and set permissions with user and group id
-    testmkd /mnt/var/run/dbus messagebus:messagebus
-    testmkd /mnt/var/lib/dbus
-    # console-kit-daemon is often not started properly (why ever)
-    sed -i /mnt/etc/init.d/dbus \
-        -e '/start_daemon -f $DBUS_D/a\
-\ \ \ \ \ \ \ \ start_daemon -f /usr/sbin/console-kit-daemon'
+    # console-kit-daemon, polkitd, udisks-daemon, rtkit-daemon are often not
+    # started properly (why ever)
+    d_mkrlscript entry boot.slx "# console-kit-daemon, polkitd, \
+udisks-daemon, rtkit-daemon entries added by $0: $date"
+    d_mkrlscript entry boot.slx \
+      "start_daemon -f /usr/sbin/console-kit-daemon --no-daemon"
+    d_mkrlscript entry boot.slx "start_daemon -f /usr/lib/polkit-1/polkitd"
+    d_mkrlscript entry boot.slx "start_daemon -f /usr/lib/rtkit/rtkit-daemon"
+    d_mkrlscript entry boot.slx "start_daemon -f /usr/lib/udisks/udisks-daemon"
 
     rm -rf /mnt/etc/dbus-1/system.d/*etwork*anager.conf \
-           /mnt/etc/dbus-1/system.d/nm-* \
-           /mnt/etc/dbus-1/event.d/*NetworkManager*
+           /mnt/etc/dbus-1/system.d/nm-*
 
     rllinker "dbus" $start $stop
   fi
-  if [ -f /mnt/etc/init.d/haldaemon ] ; then
-    strinfile "haldaemon:" /mnt/etc/passwd || \
-      echo "haldaemon:x:106:107:User for haldaemon:/var/run/hal:/bin/false" \
-        >> /mnt/etc/passwd
-    strinfile "haldaemon:" /mnt/etc/group || \
-      echo "haldaemon:!:107:" >> /mnt/etc/group
-    echo -n "" >/mnt/var/lib/misc/PolicyKit.reload
-    chmod a+x /mnt/var/lib/misc/PolicyKit.reload
-    # create directories and set permissions with user and group id
-    for dir in /var/run/hald /var/run/hald/hald-local \
-               /var/run/hald/hald-runner /var/cache/hald; do
-      testmkd /mnt/${dir} haldaemon:haldaemon
-    done
-    start=$(($start + 1))
-    stop=$(($stop - 1))
-    rllinker "haldaemon" $start $stop
-  fi
 fi
 }
 # function for ntp configuration