Experimental Devuan fix for the reboot stage.

lavabit · Dec 4, 2023 · 5daa711 · 5daa711
1 parent 8fb1115
commit 5daa711
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 12 deletions.
diff --git a/http/generic.debian12.vagrant.ppc.cfg → http/generic.debian12.vagrant.p64.cfg b/http/generic.debian12.vagrant.ppc.cfg → http/generic.debian12.vagrant.p64.cfg
diff --git a/scripts/devuan1/floppy.sh b/scripts/devuan1/floppy.sh
@@ -1,4 +1,7 @@
-#!/bin/bash -eux
+#!/bin/bash -eu
+
+echo after reboot
+date ; uptime ; uname -r
 
 printf 'blacklist floppy\n' > /etc/modprobe.d/floppy.conf
 

diff --git a/scripts/devuan1/network.sh b/scripts/devuan1/network.sh
@@ -67,7 +67,10 @@ printf "pre-up sleep 2\n" >> /etc/network/interfaces
 # Ensure a nameserver is being used that won't return an IP for non-existent domain names.
 printf "nameserver 4.2.2.1\nnameserver 4.2.2.2\nnameserver 208.67.220.220\n" > /etc/resolv.conf
 
+echo before reboot
+date ; uptime ; uname -r
+
 # Reboot onto the new kernel (if applicable).
-bash -c 'sleep 30 ; /sbin/reboot' &
+( /sbin/shutdown -r +1 ) &
 echo "Rebooting in thirty seconds..."
 exit 0
diff --git a/scripts/devuan2/floppy.sh b/scripts/devuan2/floppy.sh
@@ -1,4 +1,7 @@
-#!/bin/bash -eux
+#!/bin/bash -eu
+
+echo after reboot
+date ; uptime ; uname -r
 
 printf 'blacklist floppy\n' > /etc/modprobe.d/floppy.conf
 

diff --git a/scripts/devuan2/network.sh b/scripts/devuan2/network.sh
@@ -9,8 +9,12 @@ else
   printf "\n127.0.0.1 magma.localdomain\n\n" >> /etc/hosts
 fi
 
+echo before reboot
+date ; uptime ; uname -r
+
+
 # Tne network interface and DHCP client are configured by the installer
 # via the preseed config, to avoid IP address changes during a reboot.
-(sleep 30 ; /sbin/reboot) &
+( /sbin/shutdown -r +1 ) &
 echo "Rebooting in thirty seconds..."
 exit 0
diff --git a/scripts/devuan3/floppy.sh b/scripts/devuan3/floppy.sh
@@ -1,4 +1,7 @@
-#!/bin/bash -eux
+#!/bin/bash -eu
+
+echo after reboot
+date ; uptime ; uname -r
 
 printf 'blacklist floppy\n' > /etc/modprobe.d/floppy.conf
 

diff --git a/scripts/devuan3/network.sh b/scripts/devuan3/network.sh
@@ -9,8 +9,12 @@ else
   printf "\n127.0.0.1 magma.localdomain\n\n" >> /etc/hosts
 fi
 
+echo before reboot
+date ; uptime ; uname -r
+
+
 # Tne network interface and DHCP client are configured by the installer
 # via the preseed config, to avoid IP address changes during a reboot.
-(sleep 30 ; /sbin/reboot) &
+( /sbin/shutdown -r +1 ) &
 echo "Rebooting in thirty seconds..."
 exit 0
diff --git a/scripts/devuan4/floppy.sh b/scripts/devuan4/floppy.sh
@@ -1,4 +1,7 @@
-#!/bin/bash -eux
+#!/bin/bash -eu
+
+echo after reboot
+date ; uptime ; uname -r
 
 printf 'blacklist floppy\n' > /etc/modprobe.d/floppy.conf
 
@@ -10,5 +13,3 @@ for kernel in /boot/config-*; do
   mkinitramfs -o "/boot/initrd.img-${KERNEL}.img" "${KERNEL}" || exit 1
 done
 
-
-
diff --git a/scripts/devuan4/network.sh b/scripts/devuan4/network.sh
@@ -9,8 +9,11 @@ else
   printf "\n127.0.0.1 magma.localdomain\n\n" >> /etc/hosts
 fi
 
+echo before reboot
+date ; uptime ; uname -r
+
 # Tne network interface and DHCP client are configured by the installer
 # via the preseed config, to avoid IP address changes during a reboot.
-(sleep 30 ; /sbin/reboot) &
+( /sbin/shutdown -r +1 ) &
 echo "Rebooting in thirty seconds..."
 exit 0
diff --git a/scripts/devuan5/floppy.sh b/scripts/devuan5/floppy.sh
@@ -1,4 +1,7 @@
-#!/bin/bash -eux
+#!/bin/bash -eu
+
+echo after reboot
+date ; uptime ; uname -r
 
 printf 'blacklist floppy\n' > /etc/modprobe.d/floppy.conf
 
@@ -12,3 +15,4 @@ done
 
 
 
+
diff --git a/scripts/devuan5/network.sh b/scripts/devuan5/network.sh
@@ -9,8 +9,11 @@ else
   printf "\n127.0.0.1 magma.localdomain\n\n" >> /etc/hosts
 fi
 
+echo before reboot
+date ; uptime ; uname -r
+
 # Tne network interface and DHCP client are configured by the installer
 # via the preseed config, to avoid IP address changes during a reboot.
-(sleep 30 ; /sbin/reboot) &
+( /sbin/shutdown -r +1 ) &
 echo "Rebooting in thirty seconds..."
 exit 0