Hässlichen Bug bei dhclient IP Konfig. beseitig. Etliche Services

hinzugefügt. SuSE Funktionen (functions-suse...) erweitert.




git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@18 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 80 insertions, 4 deletions

diff --git a/initrd/distro-specs/debian/functions-debian b/initrd/distro-specs/debian/functions-debian
index 12521f33..1edb34a9 100644
--- a/initrd/distro-specs/debian/functions-debian
+++ b/initrd/distro-specs/debian/functions-debian
@@ -2,7 +2,7 @@
 #		linux diskless clients (executed within initial
 #		ramdisk after genconfig) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 16-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 18-01-2006
 #		Blabla
 #		Blub
 #
@@ -74,6 +74,13 @@ if [ "x$start_cron" = "xyes" ] ; then
 fi
 }
 
+# syslog service
+config_syslog () {
+if [ "x$start_syslog" = "xyes" ] ; then
+  echo >/dev/null
+fi
+}
+
 # secure shell service
 config_sshd () {
 if [ "x$start_sshd" = "xyes" ] ; then
@@ -180,3 +187,15 @@ config_xdm () {
 config_gdm () {
   echo >/dev/null
 }
+
+# configure kdm as display manager
+config_kdm () {
+  echo >/dev/null
+}
+
+# configure hal, dbus, resmgr and services like that
+config_dreshal () {
+if [ "x$start_dreshal" = "xyes" ]; then
+  echo >/dev/null
+fi
+}
diff --git a/initrd/distro-specs/suse-10.0/functions-suse-10.0 b/initrd/distro-specs/suse-10.0/functions-suse-10.0
index 2f708141..fb018b89 100644
--- a/initrd/distro-specs/suse-10.0/functions-suse-10.0
+++ b/initrd/distro-specs/suse-10.0/functions-suse-10.0
@@ -2,7 +2,7 @@
 #		linux diskless clients (executed within initial
 #		ramdisk after genconfig) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 17-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 18-01-2006
 #		Blabla
 #		Blub
 #
@@ -36,8 +36,9 @@ config_ntp () {
 local start=$1
 local stop=$2
 if [ -f /mnt/etc/init.d/ntp ] ; then
-  echo -e "ntp:x:74:65534:NTP daemon:/var/lib/ntp:/bin/false" \
-    >>/mnt/etc/passwd
+  strinfile "ntp:" /mnt/etc/passwd || \
+    echo -e "ntp:x:74:65534:NTP daemon:/var/lib/ntp:/bin/false" \
+      >>/mnt/etc/passwd
   testmkd /mnt/var/lib/ntp/var/run/ntp &>/dev/null
   if [ "x$start_ntp" = "xinitial" ] ; then
     echo -e "# entry added by $0: $date" \
@@ -74,6 +75,22 @@ if [ "x$start_cron" = "xyes" ] ; then
 fi
 }
 
+# syslog service
+config_syslog () {
+if [ "x$start_syslog" = "xyes" ] ; then
+  if [ -f /mnt/etc/init.d/syslog ] ; then
+  # how to configure remote log server?
+  # logging servers might be specified in $log_servers (from e.g. dhcp)
+    echo -e "# File modified by $0 within initial ramdisk" \
+      > /etc/syslog-ng.conf
+    sed -e "s,.*dhcp/dev.*,," -e "s,.*named/dev.*,," \
+      /mnt/etc/syslog-ng/syslog-ng.conf >> /etc/syslog-ng.conf
+      cp /etc/syslog-ng.conf /mnt/etc/syslog-ng/syslog-ng.conf
+      rllinker syslog "$1" "$2"
+  fi
+fi
+}
+
 # secure shell service
 config_sshd () {
 if [ "x$start_sshd" = "xyes" ] ; then
@@ -283,11 +300,18 @@ else
 [server-Standard]\nname=Standard server\ncommand=/usr/X11R6/bin/X\n\
 flexible=true\nhandled=true" >>/mnt/etc/opt/gnome/gdm/gdm.conf
 fi
+# start the display manager as early as possible
 ln -sf /etc/init.d/xdm /mnt/etc/init.d/boot.d/S01boot.xdm
 ln -sf /etc/init.d/xdm /mnt/etc/init.d/rc5.d/S01xdm
 ln -sf /etc/init.d/xdm /mnt/etc/init.d/rc5.d/K20xdm
 }
 
+# configure gdm as display manager
+config_kdm () {
+config_dm_entry yes
+
+}
+
 # consolefont
 consolefont () {
 echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
@@ -303,3 +327,36 @@ 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)
+config_dreshal () {
+local start="$1"
+local stop="$2"
+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/haldaemon ] ; then
+    strinfile "haldaemon:" /mnt/etc/passwd || \
+      echo "haldaemon:x:101:102: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"
+  fi
+fi
+}
+