From 23fe61a219159454ece3ea60c4acfcadb16e8528 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Sat, 30 Jul 2022 16:27:58 +0100
Subject: [PATCH] Switch universal-tshoot to hydbrid

---
 .../dependencies.d/{mod-init-tshoot => init-mods-tshoot} | 0
 .../dependencies.d/init-mods-tshoot}                     | 0
 .../dependencies.d/init-mods}                            | 0
 .../s6-rc.d/{mod-init-tshoot => init-mods-tshoot}/run    | 9 +++++----
 .../s6-rc.d/{mod-init-apt => init-mods-tshoot}/type      | 0
 root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/up          | 1 +
 root/etc/s6-overlay/s6-rc.d/mod-init-apt/run             | 5 -----
 root/etc/s6-overlay/s6-rc.d/mod-init-apt/up              | 1 -
 root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/type         | 1 -
 root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/up           | 1 -
 .../user/contents.d/{mod-init-apt => init-mods-tshoot}   | 0
 .../s6-overlay/s6-rc.d/user/contents.d/mod-init-tshoot   | 0
 12 files changed, 6 insertions(+), 12 deletions(-)
 rename root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/{mod-init-tshoot => init-mods-tshoot} (100%)
 rename root/etc/s6-overlay/s6-rc.d/{mod-init-apt/dependencies.d/init-mods => init-mods-package-install/dependencies.d/init-mods-tshoot} (100%)
 rename root/etc/s6-overlay/s6-rc.d/{mod-init-tshoot/dependencies.d/mod-init-apt => init-mods-tshoot/dependencies.d/init-mods} (100%)
 rename root/etc/s6-overlay/s6-rc.d/{mod-init-tshoot => init-mods-tshoot}/run (57%)
 rename root/etc/s6-overlay/s6-rc.d/{mod-init-apt => init-mods-tshoot}/type (100%)
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/up
 delete mode 100755 root/etc/s6-overlay/s6-rc.d/mod-init-apt/run
 delete mode 100644 root/etc/s6-overlay/s6-rc.d/mod-init-apt/up
 delete mode 100644 root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/type
 delete mode 100644 root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/up
 rename root/etc/s6-overlay/s6-rc.d/user/contents.d/{mod-init-apt => init-mods-tshoot} (100%)
 delete mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/mod-init-tshoot

diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/mod-init-tshoot b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-tshoot
similarity index 100%
rename from root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/mod-init-tshoot
rename to root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-tshoot
diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-apt/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods-tshoot
similarity index 100%
rename from root/etc/s6-overlay/s6-rc.d/mod-init-apt/dependencies.d/init-mods
rename to root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods-tshoot
diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/dependencies.d/mod-init-apt b/root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/dependencies.d/init-mods
similarity index 100%
rename from root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/dependencies.d/mod-init-apt
rename to root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/dependencies.d/init-mods
diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/run b/root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/run
similarity index 57%
rename from root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/run
rename to root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/run
index db9afcd..67a70cd 100755
--- a/root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/run
@@ -2,15 +2,16 @@
 
 ## Ubuntu
 if [ -f /usr/bin/apt ]; then
-    apt-get install --no-install-recommends -y \
+    echo "\
         dnsutils \
         net-tools \
         iputils-ping \
-        traceroute
+        traceroute" >> /mod-repo-packages-to-install.list
+
 fi
 # Alpine
 if [ -f /sbin/apk ]; then
-    apk add --no-cache \
+    echo "\
         bind-tools \
-        net-tools
+        net-tools" >> /mod-repo-packages-to-install.list
 fi
diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-apt/type b/root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/type
similarity index 100%
rename from root/etc/s6-overlay/s6-rc.d/mod-init-apt/type
rename to root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/type
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/up b/root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/up
new file mode 100644
index 0000000..86fdb96
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mods-tshoot/run
diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-apt/run b/root/etc/s6-overlay/s6-rc.d/mod-init-apt/run
deleted file mode 100755
index 4797eca..0000000
--- a/root/etc/s6-overlay/s6-rc.d/mod-init-apt/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-if [ -f /usr/bin/apt ]; then
-    apt-get update
-fi
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-apt/up b/root/etc/s6-overlay/s6-rc.d/mod-init-apt/up
deleted file mode 100644
index 1af9182..0000000
--- a/root/etc/s6-overlay/s6-rc.d/mod-init-apt/up
+++ /dev/null
@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/mod-init-apt/run
diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/type b/root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/type
deleted file mode 100644
index bdd22a1..0000000
--- a/root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/type
+++ /dev/null
@@ -1 +0,0 @@
-oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/up b/root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/up
deleted file mode 100644
index f6c74c2..0000000
--- a/root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/up
+++ /dev/null
@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/mod-init-tshoot/run
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/mod-init-apt b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-tshoot
similarity index 100%
rename from root/etc/s6-overlay/s6-rc.d/user/contents.d/mod-init-apt
rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-tshoot
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/mod-init-tshoot b/root/etc/s6-overlay/s6-rc.d/user/contents.d/mod-init-tshoot
deleted file mode 100644
index e69de29..0000000