From 89c54200624b8402f2ae2169577b3543a399c526 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Wed, 16 Aug 2006 10:43:25 +0000
Subject: Allow to use admin provided passwd and shadow files (do not create a
 custom file, if /rootfs/etc/passwd is present in stage3/initramfs)

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@301 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/initrd-stuff/bin/servconfig | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'initrd')

diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index a4577a97..1e50b6d7 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -12,7 +12,7 @@
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 #               (c) 2006 - opendiskless.org project
 # 
-# Version:      0.1.2b
+# Version:      0.1.2c
 
 # check for configuration files to source
 
@@ -109,9 +109,12 @@ localization $country
 
 #######################################################################
 # setup passwd and shadow for local system users like root, bin, daemon
-# and nobody ... all other users should be added externally or with the
-# corresponding services
-basepasswd
+# and nobody if no user/admin provided passwd exists ...
+# the root password provided by machine-setup is used only if no passwd
+# file is provided (default case)
+if [ ! -f /rootfs/etc/passwd ] ; then
+  basepasswd
+fi
 
 #######################################################################
 # dns and ip configuration
-- 
cgit v1.2.3-55-g7522