* initrd: fix ssh start for debian

 * installer: fix: set root pw according the client distro, not server - therefore
  introduce distro-specific client configuration files
 * installer: fix sourcing of files for distro detection
 * 



git-svn-id: http://svn.openslx.org/svn/openslx/trunk@388 95ad53e4-c205-0410-b2fa-d234c58c8868

9 files changed, 11 insertions, 8 deletions

diff --git a/installer/distro-specs/config-client-debian b/installer/distro-specs/config-client-debian
new file mode 100644
index 00000000..5d900fb1
--- /dev/null
+++ b/installer/distro-specs/config-client-debian
@@ -0,0 +1,2 @@
+# sets the root password to dxs-root
+root_pw='$1$IsfFrvVb$eSbGgmcX2O9VABhf7R5DK/'
diff --git a/installer/distro-specs/config-client-gentoo b/installer/distro-specs/config-client-gentoo
new file mode 100644
index 00000000..d2680458
--- /dev/null
+++ b/installer/distro-specs/config-client-gentoo
@@ -0,0 +1,2 @@
+# wild guess on correct format of password string (dxs-root)
+root_pw='$1$yhUR.J5f$t4Djzm0SWX1hCmCVoIZ371'
diff --git a/installer/distro-specs/config-client-suse b/installer/distro-specs/config-client-suse
new file mode 100644
index 00000000..30255708
--- /dev/null
+++ b/installer/distro-specs/config-client-suse
@@ -0,0 +1 @@
+root_pw='$2a$10$MoEYhIPZGCtR62R8UvBl3emNn2qMOuQpLQpfmNnhya4bGLhyF0pbu'
diff --git a/installer/distro-specs/config-client-ubuntu b/installer/distro-specs/config-client-ubuntu
new file mode 100644
index 00000000..2492a8cd
--- /dev/null
+++ b/installer/distro-specs/config-client-ubuntu
@@ -0,0 +1,2 @@
+#dxs-root
+root_pw='$1$g6r0DhjJ$MIR/ljfVDTXExIQXMwnLZ/'
diff --git a/installer/distro-specs/config-debian b/installer/distro-specs/config-debian
index 2e71bfd2..7ce5e5e3 100644
--- a/installer/distro-specs/config-debian
+++ b/installer/distro-specs/config-debian
@@ -6,5 +6,3 @@ client_conf="/etc/dxs/client.cfg/machine-setup.default"
 # this variable choses which atftpd template file to chose
 atftpd_conf_name="atftpd_default"
 
-# wild guess on correct format of password string (dxs-root)
-root_pw='$1$yhUR.J5f$t4Djzm0SWX1hCmCVoIZ371'
diff --git a/installer/distro-specs/config-gentoo b/installer/distro-specs/config-gentoo
index a0119071..9b9dafcc 100644
--- a/installer/distro-specs/config-gentoo
+++ b/installer/distro-specs/config-gentoo
@@ -6,5 +6,3 @@ client_conf="/etc/dxs/client.cfg/machine-setup.default"
 # this variable choses which atftpd template file to chose
 atftpd_conf_name="atftpd_default"
 
-# wild guess on correct format of password string (dxs-root)
-root_pw='$1$yhUR.J5f$t4Djzm0SWX1hCmCVoIZ371'
diff --git a/installer/distro-specs/config-suse b/installer/distro-specs/config-suse
index d87cc9a9..ea17589f 100644
--- a/installer/distro-specs/config-suse
+++ b/installer/distro-specs/config-suse
@@ -6,4 +6,3 @@ 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 ae80c229..7284def8 100644
--- a/installer/distro-specs/config-ubuntu
+++ b/installer/distro-specs/config-ubuntu
@@ -5,4 +5,3 @@ 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$g6r0DhjJ$MIR/ljfVDTXExIQXMwnLZ/'
diff --git a/installer/ld4-inst b/installer/ld4-inst
index 12a23626..404c7287 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -193,8 +193,8 @@ configure() {
     for i in /bin/lsb_release /usr/bin/lsb_release; do
       if [ -e $i ] ; then
         $i > /dev/null 2>&1 || break
-        server_distro=`. $i -i | sed "s/.*\t//"`
-        server_distro_ver=`. $i -r | sed "s/.*\t//"`
+        server_distro=`$i -i | sed "s/.*\t//"`
+        server_distro_ver=`$i -r | sed "s/.*\t//"`
         break
       fi
     done
@@ -233,6 +233,7 @@ configure() {
   fi
 
   . distro-specs/config-${server_distro}
+  . distro-specs/config-client-${client_distro}
 
   ask "Path for client system: " rootdir $rootdir
   ask "Path for tftpboot: " tftpbootdir $tftpbootdir
@@ -395,6 +396,7 @@ setup_server () {
 
   # copy the client configuration default file and replace root_pw -
   # machine-setup
+  # echo "setting root password: ${root_pw}"
   sed -e "s,@@@root_pw@@@,'${root_pw}'," default_files/machine-setup.default \
     > ${dxs_cl_dir}/${dxs_client_conf}