Merge pull request #504 from jfly/actually-reboot

Actually reboot if the reboot phase is specified

Author: Mic92

src/nixos-anywhere.sh

@@ -753,17 +753,24 @@ if [ ! -z ${NIXOS_NO_CHECK+0} ]; then
   export NIXOS_NO_CHECK
 fi
 nixos-install --no-root-passwd --no-channel-copy --system "$nixosSystem"
-if [ ${phases[reboot]} == 1 ]; then
+SSH
+
+}
+
+nixosReboot() {
+  step Rebooting
+  runSsh sh <<SSH
   if command -v zpool >/dev/null && [ "\$(zpool list)" != "no pools available" ]; then
     # we always want to export the zfs pools so people can boot from it without force import
     umount -Rv /mnt/
     swapoff -a
     zpool export -a || true
   fi
   nohup sh -c 'sleep 6 && reboot' >/dev/null &
-fi
 SSH
 
+  step Waiting for the machine to become unreachable due to reboot
+  while runSshTimeout -- exit 0; do sleep 1; done
 }
 
 main() {
@@ -884,8 +891,7 @@ main() {
   fi
 
   if [[ ${phases[reboot]} == 1 ]]; then
-    step Waiting for the machine to become unreachable due to reboot
-    while runSshTimeout -- exit 0; do sleep 1; done
+    nixosReboot
   fi
 
   step "Done!"