summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorJesse Keating <jkeating@redhat.com>2012-06-07 22:09:26 -0700
committerJesse Keating <jkeating@redhat.com>2012-06-08 10:06:49 -0700
commit6a5deaff7cd9710f9267f48001d4331958bacd45 (patch)
tree35b6f89f061aa98f1eb395a9c3653f2a84f25d0b /data
parentfcb1049bffe200acebac3372d8af7fc60926c892 (diff)
downloadanaconda-6a5deaff7cd9710f9267f48001d4331958bacd45.tar.gz
anaconda-6a5deaff7cd9710f9267f48001d4331958bacd45.tar.xz
anaconda-6a5deaff7cd9710f9267f48001d4331958bacd45.zip
Move sshpw handling out of Anaconda
This creates an ExecStartPre on the anaconda-sshd.service that will check for a kickstart entry for sshpw. It will add/modify users accordingly prior to launching the sshd service. Since now sshpw and sshd bring up happens outside of and before anaconda starts, we can remove sshd.py and any reference to it.
Diffstat (limited to 'data')
-rw-r--r--data/systemd/anaconda-sshd.service1
1 files changed, 1 insertions, 0 deletions
diff --git a/data/systemd/anaconda-sshd.service b/data/systemd/anaconda-sshd.service
index ca1f87c10..2588a533a 100644
--- a/data/systemd/anaconda-sshd.service
+++ b/data/systemd/anaconda-sshd.service
@@ -6,5 +6,6 @@ After=syslog.target network.target
[Service]
EnvironmentFile=/etc/sysconfig/sshd
ExecStartPre=/usr/sbin/sshd-keygen
+ExecStartPre=/usr/sbin/handle-sshpw
ExecStart=/usr/sbin/sshd -D $OPTIONS -f /etc/ssh/sshd_config.anaconda
ExecReload=/bin/kill -HUP $MAINPID