From 907d18debbfd0b49a8a57683b602bdd66ffe8eb3 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sun, 28 Feb 2010 17:18:39 +0100
Subject: Add slx binary path (var/opt/openslx/bin), fix console-kit-daemon
 issue ...

---
 initramfs/distro-specs/debian/functions-default |  4 ++++
 initramfs/distro-specs/suse/functions-11.2      | 16 +++++++++++-----
 initramfs/distro-specs/suse/functions-default   |  2 +-
 initramfs/distro-specs/ubuntu/functions-default |  6 +++++-
 4 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'initramfs')

diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default
index 9877f493..e039bcff 100644
--- a/initramfs/distro-specs/debian/functions-default
+++ b/initramfs/distro-specs/debian/functions-default
@@ -56,6 +56,10 @@ config_distro () {
 
   # create needed auxiliary directories in (/mnt)/var,/etc,...
   testmkd /mnt/var/run/screens root:utmp 0755
+
+  # add the slx specific path (/var/opt/openslx/bin) to the PATH variable
+  echo -e "# stuff generated by $0 (out of InitRamFS written $date)\n\
+export PATH=\"\$PATH:/var/opt/openslx/bin\"" >>/mnt/etc/profile
 }
 
 # initial (boot time) runlevel scripts
diff --git a/initramfs/distro-specs/suse/functions-11.2 b/initramfs/distro-specs/suse/functions-11.2
index 62ef1142..ae8008b9 100644
--- a/initramfs/distro-specs/suse/functions-11.2
+++ b/initramfs/distro-specs/suse/functions-11.2
@@ -41,11 +41,13 @@ config_dreshal () {
 local start=1
 local stop=10
 if [ "x$start_dreshal" = "xyes" ]; then
-  testmkd /mnt/var/lib/misc
-  testmkd /mnt/var/run/PolicyKit polkituser:polkituser 
-  testmkd /mnt/var/lib/PolicyKit polkituser:polkituser
-  testmkd /mnt/var/run/dbus/at_console/pool
-
+  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
+    testmkd /mnt${dir}
+  done
+  # enable access to removable devices
   sed -i /mnt/etc/PolicyKit/PolicyKit.conf \
       -e "s/\(<\/config>\)/    @@new@@\n\1/" \
       -e "s/@@new@@/<match action=\"@@action@@\">\n@@return@@\n    <\/match>/" \
@@ -61,6 +63,10 @@ if [ "x$start_dreshal" = "xyes" ]; then
 	# 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'
 
     rm -rf /mnt/etc/dbus-1/system.d/*etwork*anager.conf \
            /mnt/etc/dbus-1/system.d/nm-* \
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index 5b02909b..d9efadbd 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -1,5 +1,5 @@
 # Copyright (c) 2003..2006 - RZ Uni Freiburg
-# Copyright (c) 2006..2008 - OpenSLX GmbH
+# Copyright (c) 2006..2010 - OpenSLX GmbH
 #
 # This program/file is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index 4215920d..cdcf06f4 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -1,5 +1,5 @@
 # Copyright (c) 2003..2006 - RZ Uni Freiburg
-# Copyright (c) 2006..2009 - OpenSLX GmbH
+# Copyright (c) 2006..2010 - OpenSLX GmbH
 #
 # This program/file is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -85,6 +85,10 @@ config_distro () {
   sed -e "3i# Script modified during SLX stage3 bootup (config_distro)" \
       -e "/pre_mountall/,/post_mountall/d" \
       -i /mnt/etc/init.d/mountall.sh
+
+  # add the slx specific path (/var/opt/openslx/bin) to the PATH variable
+  echo -e "# stuff generated by $0 (out of InitRamFS written $date)\n\
+export PATH=\"\$PATH:/var/opt/openslx/bin\"" >>/mnt/etc/profile
 }
 
 # initial (boot time) runlevel scripts
-- 
cgit v1.2.3-55-g7522