summaryrefslogtreecommitdiffstats
path: root/initrd
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-03-29 11:51:27 +0200
committerDirk von Suchodoletz2006-03-29 11:51:27 +0200
commit4a6fdde3913deab3ac31b5d4a8f71b66e2b85718 (patch)
treef5ca560c22adffff0623740655293e305fd3a8f9 /initrd
parentfixed ugly bug with ldd library detection, fixed bug for dhcpcd use, (diff)
downloadcore-4a6fdde3913deab3ac31b5d4a8f71b66e2b85718.tar.gz
core-4a6fdde3913deab3ac31b5d4a8f71b66e2b85718.tar.xz
core-4a6fdde3913deab3ac31b5d4a8f71b66e2b85718.zip
forgot to copy the new location of machine.setup and corresponding stuff
... git-svn-id: http://svn.openslx.org/svn/openslx/ld4@130 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd')
-rwxr-xr-xinitrd/initrd-stuff/bin/servconfig1
-rw-r--r--initrd/initrd-stuff/etc/functions3
2 files changed, 3 insertions, 1 deletions
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 5799e5f7..497be9b7 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -116,6 +116,7 @@ case ${DISTRO} in
done
;;
gentoo*)
+ # rather different runlevel concept
rm /mnt/etc/*/.critical 2>/dev/null
for i in ${D_INITSCRIPTS}; do
ln -sf /etc${D_INITDIR}/$i /mnt/etc/${D_INITBOOTD}/$i
diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index 0dc48254..f59ef9c7 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -390,7 +390,8 @@ 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:::/;/^root.*/d' /tmp/newpasswd >> /mnt/etc/shadow
+sed 's/:.*/:!:13078:0:99999:7:::/;/^root.*/d' /tmp/newpasswd \
+ >> /mnt/etc/shadow
}
#######################################################################