Devuan 2-5 reboot logic fixed.

lavabit · Dec 6, 2023 · bc5b014 · bc5b014
1 parent 8cf0aba
commit bc5b014
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 44 deletions.
diff --git a/scripts/devuan1/network.sh b/scripts/devuan1/network.sh
@@ -71,6 +71,6 @@ echo before reboot
 date ; uptime ; uname -r
 
 # Reboot onto the new kernel (if applicable).
-( /sbin/shutdown -r +1 ) &
-echo "Rebooting in thirty seconds..."
+bash -c 'sleep 10 ; /sbin/reboot' &
+echo "Rebooting..."
 exit 0
diff --git a/scripts/devuan2/floppy.sh b/scripts/devuan2/floppy.sh
@@ -1,8 +1,5 @@
 #!/bin/bash -eu
 
-echo after reboot
-date ; uptime ; uname -r
-
 printf 'blacklist floppy\n' > /etc/modprobe.d/floppy.conf
 
 # Then run this instead to rebuild all of the install 
@@ -12,6 +9,3 @@ for kernel in /boot/config-*; do
   KERNEL=${kernel#*-}
   mkinitramfs -o "/boot/initrd.img-${KERNEL}.img" "${KERNEL}" || exit 1
 done
-
-
-
diff --git a/scripts/devuan2/network.sh b/scripts/devuan2/network.sh
@@ -9,12 +9,8 @@ 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
+# The network interface and DHCP client are configured by the installer
 # via the preseed config, to avoid IP address changes during a reboot.
 ( /sbin/shutdown -r +1 ) &
-echo "Rebooting in thirty seconds..."
+echo "Rebooting..."
 exit 0
diff --git a/scripts/devuan3/floppy.sh b/scripts/devuan3/floppy.sh
@@ -1,8 +1,5 @@
 #!/bin/bash -eu
 
-echo after reboot
-date ; uptime ; uname -r
-
 printf 'blacklist floppy\n' > /etc/modprobe.d/floppy.conf
 
 # Then run this instead to rebuild all of the install 

diff --git a/scripts/devuan3/network.sh b/scripts/devuan3/network.sh
@@ -9,12 +9,8 @@ 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
+# The network interface and DHCP client are configured by the installer
 # via the preseed config, to avoid IP address changes during a reboot.
 ( /sbin/shutdown -r +1 ) &
-echo "Rebooting in thirty seconds..."
+echo "Rebooting..."
 exit 0
diff --git a/scripts/devuan4/floppy.sh b/scripts/devuan4/floppy.sh
@@ -1,8 +1,5 @@
 #!/bin/bash -eu
 
-echo after reboot
-date ; uptime ; uname -r
-
 printf 'blacklist floppy\n' > /etc/modprobe.d/floppy.conf
 
 # Then run this instead to rebuild all of the install 
@@ -12,4 +9,3 @@ for kernel in /boot/config-*; do
   KERNEL=${kernel#*-}
   mkinitramfs -o "/boot/initrd.img-${KERNEL}.img" "${KERNEL}" || exit 1
 done
-
diff --git a/scripts/devuan4/network.sh b/scripts/devuan4/network.sh
@@ -9,11 +9,8 @@ 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
+# The network interface and DHCP client are configured by the installer
 # via the preseed config, to avoid IP address changes during a reboot.
 ( /sbin/shutdown -r +1 ) &
-echo "Rebooting in thirty seconds..."
+echo "Rebooting..."
 exit 0
diff --git a/scripts/devuan5/floppy.sh b/scripts/devuan5/floppy.sh
@@ -1,8 +1,5 @@
 #!/bin/bash -eu
 
-echo after reboot
-date ; uptime ; uname -r
-
 printf 'blacklist floppy\n' > /etc/modprobe.d/floppy.conf
 
 # Then run this instead to rebuild all of the install 
@@ -12,7 +9,3 @@ for kernel in /boot/config-*; do
   KERNEL=${kernel#*-}
   mkinitramfs -o "/boot/initrd.img-${KERNEL}.img" "${KERNEL}" || exit 1
 done
-
-
-
-
diff --git a/scripts/devuan5/network.sh b/scripts/devuan5/network.sh
@@ -9,11 +9,8 @@ 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
+# The network interface and DHCP client are configured by the installer
 # via the preseed config, to avoid IP address changes during a reboot.
 ( /sbin/shutdown -r +1 ) &
-echo "Rebooting in thirty seconds..."
+echo "Rebooting..."
 exit 0