From 2c8289173525442e353a713795b44d55368fbc8f Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sun, 26 Mar 2006 23:22:18 +0000
Subject: 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
---
 initrd/initrd-stuff/etc/functions | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

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
 }
 
 #######################################################################
-- 
cgit v1.2.3-55-g7522