CentOS Stream ISOs updated.

generic-libvirt.json

@@ -5914,7 +5914,7 @@
         "/bin/sh<enter><wait10>",
         "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0<enter><wait5>",
         "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/generic.dragonflybsd6.vagrant.cfg<enter><wait10>",
-        "sh -ex /tmp/installerconfig<enter><wait>"
+        "sh -ex /tmp/installerconfig && reboot<enter><wait>"
       ],
       "format": "qcow2",
       "disk_size": "131072",

http/generic.dragonflybsd6.vagrant.cfg

@@ -119,28 +119,32 @@ nameserver 4.2.2.2
 nameserver 208.67.220.220
 EOF
 
-ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg install sed
-ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg install curl
-ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg install sudo
+# The pkg command requires a valid /dev/null path, so we fake it with an
+# empty file.
+touch /mnt/dev/null
+ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg update
+ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg install gsed
 ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 chroot /mnt pkg install bash
+rm -f /mnt/dev/null
 
-# Setup bash a valid login shell.
-chroot /mnt ln /usr/local/bin/bash /usr/bin/bash
-chroot /mnt ln /usr/local/bin/bash /bin/bash
+# Setup bash as a valid login shell. If this step fails, it will prevent the
+# the root user from being able to login. So we abort the install instead.
+chroot /mnt ln /usr/local/bin/bash /usr/bin/bash || exit 1
+chroot /mnt ln /usr/local/bin/bash /bin/bash || exit 1
 
 cat <<-EOF >> /mnt/etc/shells
 /usr/bin/bash
 /bin/bash
 EOF
 
-echo 'vagrant' | chroot /mnt pw user mod root -h 0 -n root
-chroot /mnt chsh -s /usr/bin/bash root
-chroot /mnt pwd_mkdb /etc/master.passwd
+echo 'vagrant' | chroot /mnt pw user mod root -h 0 -n root || exit 1
+chroot /mnt chsh -s /usr/bin/bash root || exit 1
+chroot /mnt pwd_mkdb /etc/master.passwd || exit 1
 
 # Modify OpenSSH to allow root logins.
 sed -i -e "s/^[# ]*UseDNS.*/UseDNS no/g" /mnt/etc/ssh/sshd_config
 sed -i -e "s/^[# ]*UsePAM.*/UsePAM yes/g" /mnt/etc/ssh/sshd_config
 sed -i -e "s/^[# ]*PermitRootLogin.*/PermitRootLogin yes/g" /mnt/etc/ssh/sshd_config
 sed -i -e "s/^[# ]*PasswordAuthentication.*/PasswordAuthentication yes/g" /mnt/etc/ssh/sshd_config
 
-#reboot
+reboot