From b389b1d21518e0e2b2a8afab05e20ed8075d8142 Mon Sep 17 00:00:00 2001
From: Nico Dietrich
Date: Tue, 4 Apr 2006 19:21:45 +0000
Subject: introduce distribution dependant root password

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@154 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 installer/default_files/machine-setup_default | 2 +-
 installer/distro-specs/config-suse            | 2 ++
 installer/distro-specs/config-ubuntu          | 1 +
 installer/ld4-inst                            | 6 +++---
 4 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'installer')

diff --git a/installer/default_files/machine-setup_default b/installer/default_files/machine-setup_default
index 24e754c5..2f75c3ab 100644
--- a/installer/default_files/machine-setup_default
+++ b/installer/default_files/machine-setup_default
@@ -19,7 +19,7 @@
 # 
 #
 # password of system administrator (root) as crypt -> 'dxs-root'
-root_pw='$2a$10$MoEYhIPZGCtR62R8UvBl3emNn2qMOuQpLQpfmNnhya4bGLhyF0pbu'
+root_pw=@@@root_pw@@@
 
 ## name service configuration defaults
 #
diff --git a/installer/distro-specs/config-suse b/installer/distro-specs/config-suse
index 26e43959..d87cc9a9 100644
--- a/installer/distro-specs/config-suse
+++ b/installer/distro-specs/config-suse
@@ -5,3 +5,5 @@ client_conf="/etc/dxs/client.cfg/machine-setup.default"
 
 # this variable choses which atftpd template file to chose
 atftpd_conf_name="atftpd_sysconfig"
+
+root_pw='$2a$10$MoEYhIPZGCtR62R8UvBl3emNn2qMOuQpLQpfmNnhya4bGLhyF0pbu'
diff --git a/installer/distro-specs/config-ubuntu b/installer/distro-specs/config-ubuntu
index 7284def8..081ef7f0 100644
--- a/installer/distro-specs/config-ubuntu
+++ b/installer/distro-specs/config-ubuntu
@@ -5,3 +5,4 @@ client_conf="/etc/dxs/client.cfg/machine-setup.default"
 
 # this variable choses which atftpd template file to chose
 atftpd_conf_name="atftpd_default"
+root_pw='$1$yhUR.J5f$t4Djzm0SWX1hCmCVoIZ371'
diff --git a/installer/ld4-inst b/installer/ld4-inst
index 01736782..4143fd7a 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -316,9 +316,9 @@ setup_server () {
     [ -d ${dxs_conf}/${dir} ] || mkdir -p ${dxs_conf}/${dir}
   done
 
-  # copy the client configuration default file - machine-setup
-  cp default_files/machine-setup_default \
-    ${client_conf}-${timestamp}
+  # 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}
 
   # creating new configuration files in $dxs_conf  
   # dhcp
-- 
cgit v1.2.3-55-g7522