From 82420113a23b6bcc7efaad0969262ce00a48dda5 Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Sun, 5 Nov 2023 01:53:34 +0000
Subject: [PATCH] Force use of unmount.  Update .gitignores.

---
 etc/runit/.gitignore                      | 19 +++++++++----------
 etc/runit/runsvdir/.gitignore             |  6 +++---
 etc/runit/runsvdir/default/.gitignore     | 20 ++++++++++----------
 etc/runit/shutdown.d/.gitignore           |  9 +++++++++
 etc/runit/shutdown.d/75-force-unmounts.sh |  1 +
 5 files changed, 32 insertions(+), 23 deletions(-)
 create mode 100644 etc/runit/shutdown.d/.gitignore
 create mode 100644 etc/runit/shutdown.d/75-force-unmounts.sh

diff --git a/etc/runit/.gitignore b/etc/runit/.gitignore
index 94a0978..5790808 100644
--- a/etc/runit/.gitignore
+++ b/etc/runit/.gitignore
@@ -1,10 +1,9 @@
-1
-2
-3
-core-services/
-crypt.awk
-ctrlaltdel
-functions
-reboot
-shutdown.d/
-stopit
+/1
+/2
+/3
+/core-services/
+/crypt.awk
+/ctrlaltdel
+/functions
+/reboot
+/stopit
diff --git a/etc/runit/runsvdir/.gitignore b/etc/runit/runsvdir/.gitignore
index f0409e2..ccc1342 100644
--- a/etc/runit/runsvdir/.gitignore
+++ b/etc/runit/runsvdir/.gitignore
@@ -1,3 +1,3 @@
-current
-previous
-single/
+/current
+/previous
+/single/
diff --git a/etc/runit/runsvdir/default/.gitignore b/etc/runit/runsvdir/default/.gitignore
index 09dd6ee..ea20f6b 100644
--- a/etc/runit/runsvdir/default/.gitignore
+++ b/etc/runit/runsvdir/default/.gitignore
@@ -1,10 +1,10 @@
-acpid
-agetty-tty1
-agetty-tty2
-agetty-tty3
-agetty-tty4
-agetty-tty5
-agetty-tty6
-dhcpcd
-sshd
-udevd
+/acpid
+/agetty-tty1
+/agetty-tty2
+/agetty-tty3
+/agetty-tty4
+/agetty-tty5
+/agetty-tty6
+/dhcpcd
+/sshd
+/udevd
diff --git a/etc/runit/shutdown.d/.gitignore b/etc/runit/shutdown.d/.gitignore
new file mode 100644
index 0000000..5a38622
--- /dev/null
+++ b/etc/runit/shutdown.d/.gitignore
@@ -0,0 +1,9 @@
+/10-sv-stop.sh
+/20-rc-shutdown.sh
+/30-seedrng.sh
+/40-hwclock.sh
+/50-wtmp.sh
+/60-udev.sh
+/70-pkill.sh
+/80-filesystems.sh
+/90-kexec.sh
diff --git a/etc/runit/shutdown.d/75-force-unmounts.sh b/etc/runit/shutdown.d/75-force-unmounts.sh
new file mode 100644
index 0000000..dca93ea
--- /dev/null
+++ b/etc/runit/shutdown.d/75-force-unmounts.sh
@@ -0,0 +1 @@
+umount -f -r -a -t nosysfs,noproc,nodevtmpfs,notmpfs