]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
ssh-client module install fix
authorDave Young <dyoung@redhat.com>
Wed, 15 Feb 2012 06:40:24 +0000 (14:40 +0800)
committerHarald Hoyer <harald@redhat.com>
Thu, 16 Feb 2012 10:21:34 +0000 (11:21 +0100)
commit 38164332e198f7cc8f339b42d555796918de04b3 try to
disallow ssh-client install for without proper options.
But ssh-client will fail installation with --sshkey for
publickey mode

Fix it by refusing to install only when both --ctty and --sshkey
are not added in options.

Signed-off-by: Dave Young <dyoung@redhat.com>
modules.d/95ssh-client/module-setup.sh

index 4410e4e78f4627aabc345ed32262c3d4207d99cd..8d62b2dd11a78e444380ea9cac10f9c2756ad16a 100755 (executable)
@@ -50,8 +50,8 @@ inst_sshenv()
 }
 
 install() {
-    [[ ! $cttyhack = yes ]] && {
-        derror "ssh interactive mode needs option --ctty!"
+    [[ ! $cttyhack = yes && ! $sshkey ]] && {
+        derror "ssh-client needs option --ctty or --sshkey!"
         return 1
     }