diff options
| author | Dirk von Suchodoletz | 2006-08-16 12:43:25 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-08-16 12:43:25 +0200 |
| commit | 89c54200624b8402f2ae2169577b3543a399c526 (patch) | |
| tree | b74eb6b3487cfc9c2a417c28ea3acdf0a7c9398f | |
| parent | Extended configuration mechanism (get tgz files instead of simple (diff) | |
| download | core-89c54200624b8402f2ae2169577b3543a399c526.tar.gz core-89c54200624b8402f2ae2169577b3543a399c526.tar.xz core-89c54200624b8402f2ae2169577b3543a399c526.zip | |
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
| -rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 11 | ||||
| -rw-r--r-- | installer/default_files/machine-setup.default | 5 |
2 files changed, 10 insertions, 6 deletions
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 diff --git a/installer/default_files/machine-setup.default b/installer/default_files/machine-setup.default index 0cc2e707..a98fec97 100644 --- a/installer/default_files/machine-setup.default +++ b/installer/default_files/machine-setup.default @@ -6,13 +6,14 @@ # New settings are simply appended, so that they might # overwrite previously defined variables # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 15-08-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 16-08-2006 # # Copyright: (c) 2003 - 2006 - RZ Universitaet Freiburg # # # password of system administrator (root) as crypt -> 'dxs-root' -# (will be changed soon) +# (will be changed soon) the password is not used if the admin provides +# a passwd file via extended config tgz root_pw=@@@root_pw@@@ ## name service configuration defaults |