From 33ea007ab9c9a6630d817644959cb1ca7ce1e1dd Mon Sep 17 00:00:00 2001
From: Felix Endres
Date: Tue, 21 Mar 2006 16:33:01 +0000
Subject: Fix: dhclientuser für Ubuntu Neue Basepasswd
 Screenresolutionermittlung

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@109 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/initrd-stuff/bin/hwautocfg | 11 ++++++-----
 initrd/initrd-stuff/etc/functions | 10 ++++++++--
 initrd/initrd-stuff/init          |  1 +
 3 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'initrd/initrd-stuff')

diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 9ce5cd75..835124a0 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -149,11 +149,12 @@ fi
 
 monmanual=yes
 
-# compute max resolution
-for res in 640x400 640x480 800x600 1024x768 1280x1024 1400x1050 1600x1200
-    do MODES="\"$res\" \"lcd$res\" $MODES"
-    [ "$res" = "$MR" ] && break
-done
+## compute max resolution
+#for res in 640x400 640x480 800x600 1024x768 1280x1024 1400x1050 1600x1200
+#    do MODES="\"$res\" \"lcd$res\" $MODES"
+#    [ "$res" = "$MR" ] && break
+#done
+MODES=`screenres | sed -n '/Recommended Screen Modes:/s/[^"]*\(.*\)/\1/p'`
 
 # finally write config file
 echo -e "#\n# autogenerated X hardware configuration by $0\n# \
diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index 90ded7fd..825eff17 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -365,8 +365,14 @@ echo "not implemented" > /tmp/ldap-done
 # base passwd/shadow, the standard user present in every system. All
 # other system users should be generated within the service function
 basepasswd () {
-echo -e "root:x:0:0:System Administrator:/root:/bin/bash" \
-  > /mnt/etc/passwd
+# strip every line with userid between 500 and 99999 from the passwd-file
+# FIXME: "nobody" will be deleted too
+cat /mnt/etc/passwd | sed '/^[a-zA-Z0-9]*:[a-zA-Z0-9]*:[1-9][0-9]\{3,4\}:/d;/^[a-zA-Z0-9]*:[a-zA-Z0-9]*:[5-9][0-9]\{2\}:/d' > /mnt/etc/newpasswd
+mv /mnt/etc/newpasswd /mnt/etc/passwd
+
+
+#echo -e "root:x:0:0:System Administrator:/root:/bin/bash" \
+#  > /mnt/etc/passwd
 echo -e "root:"$root_pw":12958:0:10000::::" > /mnt/etc/shadow
 }
 
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 39280a4d..40e6ea3b 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -365,6 +365,7 @@ That\n  might indicate some severe error."
 
 # run distribution independent and dependent configuration of files and 
 # services
+bash
 servconfig &
 
 for path in @@@COMDIRINDXS@@@ ${D_DIRINDXS} ${D_DIRINBINDMNT} ; do
-- 
cgit v1.2.3-55-g7522