Code cleanups, simplifications ...

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

1 files changed, 2 insertions, 3 deletions

diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 829cfd5f..e3b848b1 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -9,7 +9,7 @@
 #
 # General information about OpenSLX can be found at http://openslx.org
 #
-# common functions file for the configuration of linux diskless clients
+# Common functions file for the configuration of linux diskless clients
 # (included by init, hwautocfg, servconfig, ... within OpenSLX initialramfs)
 
 #############################################################################
@@ -34,7 +34,6 @@ udev_hotplug () {
 :
 }
 
-
 #############################################################################
 # generate events with the sysfs trigger
 trigger_device_events () {
@@ -518,11 +517,11 @@ sed '/^[a-zA-Z0-9]*:[a-zA-Z0-9]*:[1-9][0-9]\{3,4\}:/d;/^+:*/d;/^+$/d;
   > /tmp/newpasswd
 # and add user nobody again (is there a more elegant way?)
 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
+mv /tmp/newpasswd /mnt/etc/passwd
 chmod 0640 /mnt/etc/shadow
 }