Previously, we would only start sshd if you'd passed --kickstart to
anaconda; but, if passed a kickstart file, we would start sshd unless
you explicitly turned it off. Instead, default sshd to off for both
slow and kickstart installs, and allow it to be enabled for slow
installs from the kernel command line.
Note that, in the absence of a kickstart file specifying users, this
will start sshd with no password for root. Treat this like you would
treat 'vnc' with no 'vncpasswd'.
Signed-off-by: Adam Jackson <ajax@xxxxxxxxxx>
---
anaconda | 6 ++++--
flags.py | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/anaconda b/anaconda
index 7bac8ce..cca1ee5 100755
--- a/anaconda
+++ b/anaconda
@@ -373,6 +373,9 @@ def setupGraphicalLinks():
pass
def handleSshPw(anaconda):
+ if not anaconda.ksdata:
+ return
+
import users
u = users.Users(anaconda)
@@ -398,8 +401,6 @@ def createSshKey(algorithm, keyfile):
iutil.execWithRedirect('ssh-keygen', argv, stdout=so, stderr=se)
def startSsh():
- if not flags.sshd:
- return
if iutil.isS390():
return
@@ -953,6 +954,7 @@ if __name__ == "__main__":
anaconda.ksdata = kickstart.parseKickstart(anaconda, opts.ksfile)
opts.rescue = anaconda.ksdata.rescue.rescue
+ if flags.sshd:
# we need to have a libuser.conf that points to the installer root for
# sshpw, but after that we start sshd, we need one that points to the
# install target.
diff --git a/flags.py b/flags.py
index 05e84e9..c5aa6d8 100644
--- a/flags.py
+++ b/flags.py
@@ -85,7 +85,7 @@ class Flags:
self.__dict__['flags']['cmdline'] = self.createCmdlineDict()
self.__dict__['flags']['useIPv4'] = True
self.__dict__['flags']['useIPv6'] = True
- self.__dict__['flags']['sshd'] = 1
+ self.__dict__['flags']['sshd'] = 0
# for non-physical consoles like some ppc and sgi altix,
# we need to preserve the console device and not try to
# do things like bogl on them. this preserves what that
--
1.6.5.2
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
