diff --git a/generic-hyperv.json b/generic-hyperv.json index 093f4bdda..6d383de8b 100644 --- a/generic-hyperv.json +++ b/generic-hyperv.json @@ -3598,6 +3598,8 @@ "", "net.ifnames=0 biosdevname=0 systemd.mask=sshd.service", "", + "", + "", "sed -i 's/[#]\\?DNSSEC=.*/DNSSEC=false/g' /etc/systemd/resolved.conf", "systemctl restart systemd-resolved", "systemctl restart dhcpcd", diff --git a/generic-libvirt.json b/generic-libvirt.json index f0bd4764e..716032b14 100644 --- a/generic-libvirt.json +++ b/generic-libvirt.json @@ -3594,6 +3594,8 @@ "", "net.ifnames=0 biosdevname=0 systemd.mask=sshd.service", "", + "", + "", "sed -i 's/[#]\\?DNSSEC=.*/DNSSEC=false/g' /etc/systemd/resolved.conf", "systemctl restart systemd-resolved", "systemctl restart dhcpcd", @@ -4507,7 +4509,7 @@ "/bin/sh", "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/generic.dragonflybsd5.vagrant.cfg", - "sh /tmp/installerconfig && reboot" + "sh /tmp/installerconfig | tee /tmp/installerconfig.log && reboot" ], "format": "qcow2", "disk_size": "131072", @@ -5914,7 +5916,7 @@ "/bin/sh", "dhclient -l /tmp/dhclient.lease.vtnet0 vtnet0", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/generic.dragonflybsd6.vagrant.cfg", - "sh -ex /tmp/installerconfig | tee /tmp/installerconfig.log" + "sh /tmp/installerconfig | tee /tmp/installerconfig.log && reboot" ], "format": "qcow2", "disk_size": "131072", diff --git a/generic-parallels.json b/generic-parallels.json index 41c062769..3924d90f4 100644 --- a/generic-parallels.json +++ b/generic-parallels.json @@ -3802,6 +3802,8 @@ "", "net.ifnames=0 biosdevname=0 systemd.mask=sshd.service", "", + "", + "", "sed -i 's/[#]\\?DNSSEC=.*/DNSSEC=false/g' /etc/systemd/resolved.conf", "systemctl restart systemd-resolved", "systemctl restart dhcpcd", @@ -5338,7 +5340,7 @@ "/bin/sh", "dhclient -l /tmp/dhclient.lease.em0 em0", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/generic.dragonflybsd5.vagrant.cfg", - "sh /tmp/installerconfig && reboot" + "sh /tmp/installerconfig | tee /tmp/installerconfig.log && reboot" ], "disk_size": 32768, "cpus": 2, @@ -7675,7 +7677,7 @@ "/bin/sh", "dhclient -l /tmp/dhclient.lease.em0 em0", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/generic.dragonflybsd6.vagrant.cfg", - "sh /tmp/installerconfig && reboot" + "sh /tmp/installerconfig | tee /tmp/installerconfig.log && reboot" ], "disk_size": 32768, "cpus": 2, diff --git a/generic-virtualbox.json b/generic-virtualbox.json index 0c31a0bc5..a528877fe 100644 --- a/generic-virtualbox.json +++ b/generic-virtualbox.json @@ -3624,6 +3624,8 @@ "", "net.ifnames=0 biosdevname=0 systemd.mask=sshd.service", "", + "", + "", "sed -i 's/[#]\\?DNSSEC=.*/DNSSEC=false/g' /etc/systemd/resolved.conf", "systemctl restart systemd-resolved", "systemctl restart dhcpcd", @@ -4716,7 +4718,7 @@ "/bin/sh", "dhclient -l /tmp/dhclient.lease.em0 em0", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/generic.dragonflybsd5.vagrant.cfg", - "sh /tmp/installerconfig && reboot" + "sh /tmp/installerconfig | tee /tmp/installerconfig.log && reboot" ], "disk_size": 131072, "cpus": 2, @@ -6380,7 +6382,7 @@ "/bin/sh", "dhclient -l /tmp/dhclient.lease.em0 em0", "fetch -o /tmp/installerconfig http://{{ .HTTPIP }}:{{ .HTTPPort }}/generic.dragonflybsd6.vagrant.cfg", - "sh /tmp/installerconfig && reboot" + "sh /tmp/installerconfig | tee /tmp/installerconfig.log && reboot" ], "disk_size": 131072, "cpus": 2, diff --git a/generic-vmware.json b/generic-vmware.json index f35799da0..f163f8b03 100644 --- a/generic-vmware.json +++ b/generic-vmware.json @@ -3644,6 +3644,8 @@ "", "net.ifnames=0 biosdevname=0 systemd.mask=sshd.service", "", + "", + "", "sed -i 's/[#]\\?DNSSEC=.*/DNSSEC=false/g' /etc/systemd/resolved.conf", "systemctl restart systemd-resolved", "systemctl restart dhcpcd", diff --git a/http/generic.dragonflybsd6.vagrant.cfg b/http/generic.dragonflybsd6.vagrant.cfg index 105854997..e20216462 100644 --- a/http/generic.dragonflybsd6.vagrant.cfg +++ b/http/generic.dragonflybsd6.vagrant.cfg @@ -123,6 +123,8 @@ touch /mnt/dev/null cp /usr/local/etc/pkg/repos/df-latest.conf.sample /mnt/usr/local/etc/pkg/repos/df-latest.conf chroot /mnt /bin/sh -c 'ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg update' chroot /mnt /bin/sh -c 'ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install pkg' +cp /usr/local/etc/pkg/repos/df-latest.conf.sample /mnt/usr/local/etc/pkg/repos/df-latest.conf +chroot /mnt /bin/sh -c 'ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg update' chroot /mnt /bin/sh -c 'ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install gsed' chroot /mnt /bin/sh -c 'ASSUME_ALWAYS_YES=yes FETCH_RETRY=5 pkg install bash' rm -f /mnt/dev/null diff --git a/magma-hyperv.json b/magma-hyperv.json index 9b206dfcc..e9f560162 100644 --- a/magma-hyperv.json +++ b/magma-hyperv.json @@ -1496,6 +1496,8 @@ "", "net.ifnames=0 biosdevname=0 systemd.mask=sshd.service", "", + "", + "", "sed -i 's/[#]\\?DNSSEC=.*/DNSSEC=false/g' /etc/systemd/resolved.conf", "systemctl restart systemd-resolved", "systemctl restart dhcpcd", diff --git a/magma-libvirt.json b/magma-libvirt.json index f834a04e4..b36ac62e6 100644 --- a/magma-libvirt.json +++ b/magma-libvirt.json @@ -1495,6 +1495,8 @@ "", "net.ifnames=0 biosdevname=0 systemd.mask=sshd.service", "", + "", + "", "sed -i 's/[#]\\?DNSSEC=.*/DNSSEC=false/g' /etc/systemd/resolved.conf", "systemctl restart systemd-resolved", "systemctl restart dhcpcd", diff --git a/magma-virtualbox.json b/magma-virtualbox.json index 92c8d20f3..8761daf1c 100644 --- a/magma-virtualbox.json +++ b/magma-virtualbox.json @@ -1521,6 +1521,8 @@ "", "net.ifnames=0 biosdevname=0 systemd.mask=sshd.service", "", + "", + "", "sed -i 's/[#]\\?DNSSEC=.*/DNSSEC=false/g' /etc/systemd/resolved.conf", "systemctl restart systemd-resolved", "systemctl restart dhcpcd", diff --git a/magma-vmware.json b/magma-vmware.json index 83dbd8ae7..78c0cba65 100644 --- a/magma-vmware.json +++ b/magma-vmware.json @@ -1519,6 +1519,8 @@ "", "net.ifnames=0 biosdevname=0 systemd.mask=sshd.service", "", + "", + "", "sed -i 's/[#]\\?DNSSEC=.*/DNSSEC=false/g' /etc/systemd/resolved.conf", "systemctl restart systemd-resolved", "systemctl restart dhcpcd",