summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorNico Dietrich2006-04-04 21:31:22 +0200
committerNico Dietrich2006-04-04 21:31:22 +0200
commitec96c6cd0a02cbb1420894350bd0efdba0e6a879 (patch)
tree4c23f307e9ead07ab6b465cb55c5ff52dee0715f /installer
parentintroduce distribution dependant root password (diff)
downloadcore-ec96c6cd0a02cbb1420894350bd0efdba0e6a879.tar.gz
core-ec96c6cd0a02cbb1420894350bd0efdba0e6a879.tar.xz
core-ec96c6cd0a02cbb1420894350bd0efdba0e6a879.zip
fix for last commit
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@155 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
-rw-r--r--installer/default_files/machine-setup.default (renamed from installer/default_files/machine-setup_default)0
-rwxr-xr-xinstaller/ld4-inst2
2 files changed, 1 insertions, 1 deletions
diff --git a/installer/default_files/machine-setup_default b/installer/default_files/machine-setup.default
index 2f75c3ab..2f75c3ab 100644
--- a/installer/default_files/machine-setup_default
+++ b/installer/default_files/machine-setup.default
diff --git a/installer/ld4-inst b/installer/ld4-inst
index 4143fd7a..a686c036 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -318,7 +318,7 @@ setup_server () {
# copy the client configuration default file and replace root_pw - machine-setup
sed -e "s,@@@root_pw@@@,${root_pw}," \
- default_files/machine-setup_default > ${client_conf}-${timestamp}
+ default_files/machine-setup.default > ${dxs_conf}/${dxs_client_conf}-${timestamp}
# creating new configuration files in $dxs_conf
# dhcp