From 96e5310fb00aeee57cb381f01aa18dafb04e4272 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Wed, 18 Jan 2006 12:22:01 +0000
Subject: 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
---
 initrd/initrd-stuff/etc/functions     |  3 ++-
 initrd/initrd-stuff/etc/machine-setup | 16 +++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'initrd/initrd-stuff/etc')

diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index 23376161..6eca05c1 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -68,7 +68,6 @@ done
 case $ipcfg in
   ip)
     ip link set dev $if up
-    echo "test"
     ip addr add $ip/`nm2pref $nm` broadcast $bc dev $if
     if [ "$gw" != "0.0.0.0" ] ; then
       ip route add default via $gw
@@ -169,6 +168,8 @@ if [ "$dhcp" = "none" ] ; then
   client could be found. Please check that you have some client from\n\
   the following list installed: dhclient dhcpcd pump ipconfig." nonfatal
 else
+  # ensure the interface is up
+  ipsetup 0.0.0.0 255.255.255.255 0.0.0.0 255.255.255.255 eth0 &
   loadmod /lib/modules/@@@KERNVER@@@/kernel/net/packet/af_packet.ko \
     "needed for dhcp";
   echo "Starting $dhcp for configuration"
diff --git a/initrd/initrd-stuff/etc/machine-setup b/initrd/initrd-stuff/etc/machine-setup
index ff5580e6..343a558c 100644
--- a/initrd/initrd-stuff/etc/machine-setup
+++ b/initrd/initrd-stuff/etc/machine-setup
@@ -6,7 +6,7 @@
 #		New settings are simply appended, so that they might 
 #		overwrite previously defined variables 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 08-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 18-01-2006
 #		Blabla
 #		Blub
 #
@@ -45,6 +45,9 @@ start_sshd="yes"
 # start rwhod service (lan wide login and uptime list)
 start_rwhod="no"
 
+# start log server (remote log servers could be passed via dhcp option)
+start_syslog="yes"
+
 # start cron service
 start_cron="no"
 
@@ -54,14 +57,9 @@ start_atd="no"
 # simple network management protocol for system monitoring
 start_snmp="no"
 
-# resource manager (resmgr)
-start_resmgr="yes"
-
-# hardware abstraction layer (hal) daemon, e.g. dbus is using it 
-start_hal="yes"
-
-# dbus daemon (inter application communication for kde and gnome)
-start_dbus="yes"
+# dbus, resource manager , hal (hardware abstraction layer) interoperate
+# tighly. There might be little different solutions within each distro
+start_dreshal="yes"
 
 # start alsa sound system
 start_alsasound="yes"
-- 
cgit v1.2.3-55-g7522