summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Dietrich2006-04-04 22:15:23 +0200
committerNico Dietrich2006-04-04 22:15:23 +0200
commit1389ddb87361daf516ef5384e1d71eef0ad227c7 (patch)
tree4f2ad38f23450b5233e967a0b3ca2f6e1637cb88
parentnext fix (diff)
downloadcore-1389ddb87361daf516ef5384e1d71eef0ad227c7.tar.gz
core-1389ddb87361daf516ef5384e1d71eef0ad227c7.tar.xz
core-1389ddb87361daf516ef5384e1d71eef0ad227c7.zip
fix ssh in debian and ubuntu
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@158 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--initrd/distro-specs/debian/functions-3.13
-rw-r--r--initrd/distro-specs/ubuntu/functions-5.103
-rwxr-xr-xinstaller/ld4-inst2
3 files changed, 3 insertions, 5 deletions
diff --git a/initrd/distro-specs/debian/functions-3.1 b/initrd/distro-specs/debian/functions-3.1
index 71914973..f317af38 100644
--- a/initrd/distro-specs/debian/functions-3.1
+++ b/initrd/distro-specs/debian/functions-3.1
@@ -106,8 +106,7 @@ fi
# secure shell service
config_sshd () {
if [ "x$start_sshd" = "xyes" ] ; then
- if [ -f /mnt/etc/init.d/sshd ] ; then
- testmkd /mnt/var/lib/sshd; testmkd /mnt/var/lib/empty
+ if [ -f /mnt/etc/init.d/ssh ] ; then
rllinker "sshd" "$1" "$2"
fi
fi
diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index 75ade847..4a04a094 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -137,8 +137,7 @@ fi
# secure shell service
config_sshd () {
if [ "x$start_sshd" = "xyes" ] ; then
- if [ -f /mnt/etc/init.d/sshd ] ; then
- testmkd /mnt/var/lib/sshd; testmkd /mnt/var/lib/empty
+ if [ -f /mnt/etc/init.d/ssh ] ; then
rllinker "sshd" "12" "10"
fi
fi
diff --git a/installer/ld4-inst b/installer/ld4-inst
index 69815d74..2a3156d5 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -190,7 +190,7 @@ configure() {
# evtl. optional? --> besser in ein komplett eigenes Setup-Skript fuer
# machine-setup
- ask "Where automount home directories from? (A.B.C.D:/home-dir)" amt $server":/home"
+ ask "Where automount home directories from? (A.B.C.D:/home-dir): " amt $server":/home"
# more information here!! set useful default
ask "Which debug level should be used? " debuglevel $debuglevel