fix for sshd did not started when FAI flags are defined early

faiproject · Apr 5, 2016 · 3d0b80e · 3d0b80e
1 parent fdc9649
commit 3d0b80e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bin/fai b/bin/fai
@@ -99,6 +99,7 @@ fai_init() {
 
     if [ $do_init_tasks -eq 1 ]; then
         eval_cmdline
+        define_fai_flags
         [ -d /sys/kernel ] || mount -t sysfs sysfs /sys
         # we really need to start udev
         if [ -x /etc/init.d/udev ]; then
@@ -108,7 +109,7 @@ fai_init() {
                 test -f /etc/init/udevtrigger.conf && udevadm trigger --action=add && udevadm settle
             fi
         fi
-        mkdir -p /var/run/network /dev/shm/network # when using initrd kernels
+        mkdir -p /var/run/sshd /var/run/network /dev/shm/network # when using initrd kernels
         ifup lo
         [ -x /sbin/portmap ] && /sbin/portmap
 	if [ -x /sbin/rpcbind ]; then

diff --git a/lib/subroutines b/lib/subroutines
@@ -320,7 +320,6 @@ task_setup() {
         }
 
         # start secure shell daemon for remote access
-        mkdir -p /var/run/sshd # ubuntu fix for 9.10
         if [ "$flag_sshd" -a -x /usr/sbin/sshd ]; then
             pgrep -x sshd >/dev/null || /usr/sbin/sshd
         fi