summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-08-16 12:43:25 +0200
committerDirk von Suchodoletz2006-08-16 12:43:25 +0200
commit89c54200624b8402f2ae2169577b3543a399c526 (patch)
treeb74eb6b3487cfc9c2a417c28ea3acdf0a7c9398f /installer
parentExtended configuration mechanism (get tgz files instead of simple (diff)
downloadcore-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
Diffstat (limited to 'installer')
-rw-r--r--installer/default_files/machine-setup.default5
1 files changed, 3 insertions, 2 deletions
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