fixed ugly bug with ldd library detection, fixed bug for dhcpcd use,

started to integrate gentoo, minor fixes ...



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

2 files changed, 3 insertions, 105 deletions

diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index 65a811ca..0dc48254 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -237,8 +237,8 @@ case $dhcp in
       error "  Fatal error occured while trying to run dhclient.\n$commonerr" 
   ;;
   dhcpcd)
-    ln -s /bin/dhcpmkconfig /bin/dhcpd.exe
-    dhcpcd -L /var/lib/dhcp -c /bin/dhcpd.exe -T -t 30 eth0 2>&1 >/dev/null || \
+    ln -s /bin/dhcpmkconfig /bin/dhcpcd.exe
+    dhcpcd -L /var/lib/dhcp -c /bin/dhcpcd.exe -T -t 30 eth0 2>&1 >/dev/null || \
       error "  Fatal error occured while trying to run dhcpcd.\n$commonerr" 
   ;;
   pump)
@@ -390,7 +390,7 @@ sed -n -e '/nobody/p' /mnt/etc/passwd >> /tmp/newpasswd
 cp /tmp/newpasswd /mnt/etc/passwd
 # create the shadow from passwd file
 echo -e "root:"$root_pw":12958:0:10000::::" > /mnt/etc/shadow
-sed 's/:.*/:!:13078:0:99999:7:::/' /tmp/newpasswd >> /mnt/etc/shadow
+sed 's/:.*/:!:13078:0:99999:7:::/;/^root.*/d' /tmp/newpasswd >> /mnt/etc/shadow
 }
 
 #######################################################################
diff --git a/initrd/initrd-stuff/etc/machine-setup b/initrd/initrd-stuff/etc/machine-setup
deleted file mode 100644
index 24e754c5..00000000
--- a/initrd/initrd-stuff/etc/machine-setup
+++ /dev/null
@@ -1,102 +0,0 @@
-# machine-setup
-# Description:  universal (distro independent) configuration file for
-#		linux diskless clients v4.0. It defines default values 
-#		for several configuration variables. These settings might
-#		be overwritten through various processes in initial ramdisk.
-#		New settings are simply appended, so that they might 
-#		overwrite previously defined variables 
-#
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 09-03-2006
-#		Blabla
-#		Blub
-#
-# Copyright:    (c) 2003 - 2006 - RZ Universitaet Freiburg
-# 
-## format variable="static_value" or variable="$serverip:123"       ##
-## it is possible to use the variables $serverip (the IP of the     ##
-## providing DHCP server - not neccessarily NFS server), $clientip  ##
-## (the IP of the client itself) and $host_name                     ##
-# 
-#
-# password of system administrator (root) as crypt -> 'dxs-root'
-root_pw='$2a$10$MoEYhIPZGCtR62R8UvBl3emNn2qMOuQpLQpfmNnhya4bGLhyF0pbu'
-
-## name service configuration defaults
-#
-# host and domain name
-host_name="dxs"
-domain_name="test.ldc"
-
-# define country for all localization stuff - see functions how country 
-# is translated to LANGUAGE, COUNTRY, LANG, KEYTABLE, XKEYBOARD,
-# KDEKEYBOARD, CHARSET, KDEKEYBOARDS, TZ and CONSOLEFONT
-country="de"
-
-## set some default variables
-#
-# enable setup of TeX environment
-tex_enable="no"
-
-## services to start (yes) or configure (may) or disable (no)
-#
-# network time protocol daemon ("yes" for normal daemon operation, 
-# "initial" just for setting during startup with ntpdate)
-start_ntp="initial"
-# set timezone if not to be derived from language setting
-# timezone="Europe/Berlin"
-
-# start sshd (hostkeys should be pregenerated by install script)
-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"
-
-# start at daemon
-start_atd="no"
-
-# simple network management protocol for system monitoring
-start_snmp="no"
-
-# 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"
-
-# start ssh server
-start_sshd="yes"
-
-# AFS network filesystem
-start_afs="no"
-this_cell="uni-freiburg.de"
-cell_server="132.230.6.237 132.230.6.236 132.230.6.235"
-
-# smb protocol service (provide windows file service)
-start_samba="may"
-netbios_workgroup="dxs-network"
-
-# automounter home (/local_dir - top level directories only) and source 
-# (server:/path)
-automnt_dir="/home"
-automnt_src="$serverip:/home"
-
-# scratch space on server
-scratch="$serverip:/dxs/tmp"
-
-# configure and start vmware services
-vmware="no"
-imgsrv="$serverip:/dxs/vmware"
-
-# kind of X11 display manager to run 
-start_xdmcp="xdm"
-
-# should Xorg/XFree server be started or some special windowmanager be run
-# in kiosk mode e.g. start_x="kde"
-start_x="yes"