From 9fbcc36241d18b0fb63934bb61f73b83afde8a27 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sun, 24 Jul 2022 14:42:54 +0100 Subject: [PATCH 1/6] v3ify --- root/etc/cont-init.d/95-apt-get | 2 +- root/etc/cont-init.d/95-tshoot-config | 0 .../init-mods-end/dependencies.d/mod-init-tshoot | 0 .../mod-init-apt/dependencies.d/init-mods | 0 root/etc/s6-overlay/s6-rc.d/mod-init-apt/run | 5 +++++ root/etc/s6-overlay/s6-rc.d/mod-init-apt/type | 1 + root/etc/s6-overlay/s6-rc.d/mod-init-apt/up | 1 + .../mod-init-tshoot/dependencies.d/mod-init-apt | 0 root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/run | 16 ++++++++++++++++ root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/type | 1 + root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/up | 1 + .../s6-rc.d/user/contents.d/mod-init-apt | 0 .../s6-rc.d/user/contents.d/mod-init-tshoot | 0 13 files changed, 26 insertions(+), 1 deletion(-) mode change 100644 => 100755 root/etc/cont-init.d/95-apt-get mode change 100644 => 100755 root/etc/cont-init.d/95-tshoot-config create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/mod-init-tshoot create mode 100644 root/etc/s6-overlay/s6-rc.d/mod-init-apt/dependencies.d/init-mods create mode 100755 root/etc/s6-overlay/s6-rc.d/mod-init-apt/run create mode 100644 root/etc/s6-overlay/s6-rc.d/mod-init-apt/type create mode 100644 root/etc/s6-overlay/s6-rc.d/mod-init-apt/up create mode 100644 root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/dependencies.d/mod-init-apt create mode 100755 root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/run create mode 100644 root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/type create mode 100644 root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/up create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/mod-init-apt create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/mod-init-tshoot diff --git a/root/etc/cont-init.d/95-apt-get b/root/etc/cont-init.d/95-apt-get old mode 100644 new mode 100755 index 4797eca..8e5fe66 --- a/root/etc/cont-init.d/95-apt-get +++ b/root/etc/cont-init.d/95-apt-get @@ -2,4 +2,4 @@ if [ -f /usr/bin/apt ]; then apt-get update -fi \ No newline at end of file +fi diff --git a/root/etc/cont-init.d/95-tshoot-config b/root/etc/cont-init.d/95-tshoot-config old mode 100644 new mode 100755 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/mod-init-tshoot new file mode 100644 index 0000000..e69de29 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/mod-init-apt/dependencies.d/init-mods new file mode 100644 index 0000000..e69de29 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 new file mode 100755 index 0000000..4797eca --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/mod-init-apt/run @@ -0,0 +1,5 @@ +#!/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/type b/root/etc/s6-overlay/s6-rc.d/mod-init-apt/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/mod-init-apt/type @@ -0,0 +1 @@ +oneshot 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 new file mode 100644 index 0000000..1af9182 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/mod-init-apt/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/mod-init-apt/run 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/mod-init-tshoot/dependencies.d/mod-init-apt new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/run b/root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/run new file mode 100755 index 0000000..db9afcd --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/run @@ -0,0 +1,16 @@ +#!/usr/bin/with-contenv bash + +## Ubuntu +if [ -f /usr/bin/apt ]; then + apt-get install --no-install-recommends -y \ + dnsutils \ + net-tools \ + iputils-ping \ + traceroute +fi +# Alpine +if [ -f /sbin/apk ]; then + apk add --no-cache \ + bind-tools \ + net-tools +fi 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 new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/type @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..f6c74c2 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/mod-init-tshoot/up @@ -0,0 +1 @@ +/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/mod-init-apt new file mode 100644 index 0000000..e69de29 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 new file mode 100644 index 0000000..e69de29 From 23fe61a219159454ece3ea60c4acfcadb16e8528 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sat, 30 Jul 2022 16:27:58 +0100 Subject: [PATCH 2/6] 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 From 4753708baa25656a8f138afedb4216a9f3eb7c97 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sat, 30 Jul 2022 16:37:29 +0100 Subject: [PATCH 3/6] Fix folder naming --- .../{init-mods-tshoot => init-mods-universal-tshoot} | 0 .../dependencies.d/init-mods | 0 .../s6-rc.d/{init-mods-tshoot => init-mods-universal-tshoot}/run | 0 .../s6-rc.d/{init-mods-tshoot => init-mods-universal-tshoot}/type | 0 .../s6-rc.d/{init-mods-tshoot => init-mods-universal-tshoot}/up | 0 .../contents.d/{init-mods-tshoot => init-mods-universal-tshoot} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/{init-mods-tshoot => init-mods-universal-tshoot} (100%) rename root/etc/s6-overlay/s6-rc.d/{init-mods-tshoot => init-mods-universal-tshoot}/dependencies.d/init-mods (100%) rename root/etc/s6-overlay/s6-rc.d/{init-mods-tshoot => init-mods-universal-tshoot}/run (100%) rename root/etc/s6-overlay/s6-rc.d/{init-mods-tshoot => init-mods-universal-tshoot}/type (100%) rename root/etc/s6-overlay/s6-rc.d/{init-mods-tshoot => init-mods-universal-tshoot}/up (100%) rename root/etc/s6-overlay/s6-rc.d/user/contents.d/{init-mods-tshoot => init-mods-universal-tshoot} (100%) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-tshoot b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-universal-tshoot similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-tshoot rename to root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-universal-tshoot diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/dependencies.d/init-mods similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/dependencies.d/init-mods rename to root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/dependencies.d/init-mods diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/run b/root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/run similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/run rename to root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/type b/root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/type similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/type rename to root/etc/s6-overlay/s6-rc.d/init-mods-universal-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-universal-tshoot/up similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-tshoot/up rename to root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/up diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-tshoot b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-universal-tshoot similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-tshoot rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-universal-tshoot From 57f9cd9020abdb0606ab6708646f8045715bda73 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 1 Aug 2022 14:54:45 +0100 Subject: [PATCH 4/6] Fix mod/mods naming --- .../dependencies.d/init-mods | 0 .../run | 0 .../type | 0 root/etc/s6-overlay/s6-rc.d/init-mod-universal-tshoot/up | 1 + .../{init-mods-universal-tshoot => init-mod-universal-tshoot} | 0 root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/up | 1 - .../{init-mods-universal-tshoot => init-mod-universal-tshoot} | 0 7 files changed, 1 insertion(+), 1 deletion(-) rename root/etc/s6-overlay/s6-rc.d/{init-mods-universal-tshoot => init-mod-universal-tshoot}/dependencies.d/init-mods (100%) rename root/etc/s6-overlay/s6-rc.d/{init-mods-universal-tshoot => init-mod-universal-tshoot}/run (100%) rename root/etc/s6-overlay/s6-rc.d/{init-mods-universal-tshoot => init-mod-universal-tshoot}/type (100%) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-universal-tshoot/up rename root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/{init-mods-universal-tshoot => init-mod-universal-tshoot} (100%) delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/up rename root/etc/s6-overlay/s6-rc.d/user/contents.d/{init-mods-universal-tshoot => init-mod-universal-tshoot} (100%) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-tshoot/dependencies.d/init-mods similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/dependencies.d/init-mods rename to root/etc/s6-overlay/s6-rc.d/init-mod-universal-tshoot/dependencies.d/init-mods diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/run b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-tshoot/run similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/run rename to root/etc/s6-overlay/s6-rc.d/init-mod-universal-tshoot/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/type b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-tshoot/type similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/type rename to root/etc/s6-overlay/s6-rc.d/init-mod-universal-tshoot/type diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-tshoot/up b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-tshoot/up new file mode 100644 index 0000000..e721e58 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-tshoot/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-tshoot/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-universal-tshoot b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-universal-tshoot similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mods-universal-tshoot rename to root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-universal-tshoot diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/up b/root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/up deleted file mode 100644 index 86fdb96..0000000 --- a/root/etc/s6-overlay/s6-rc.d/init-mods-universal-tshoot/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-mods-tshoot/run diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-universal-tshoot b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-universal-tshoot similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mods-universal-tshoot rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-universal-tshoot From 2a524f15862f3702b0334ee8707c098ac030e4b6 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 1 Aug 2022 14:56:13 +0100 Subject: [PATCH 5/6] Fix dep typo --- .../{init-mods-tshoot => init-mod-universal-tshoot} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/{init-mods-tshoot => init-mod-universal-tshoot} (100%) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods-tshoot b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-universal-tshoot similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mods-tshoot rename to root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-universal-tshoot From 9fabeee186ff07d09e6fda32be8d70d566a556cc Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sat, 27 Aug 2022 11:00:45 +0100 Subject: [PATCH 6/6] Remove duplicate dependency --- .../init-mods-end/dependencies.d/init-mod-universal-tshoot | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-universal-tshoot diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-universal-tshoot b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-universal-tshoot deleted file mode 100644 index e69de29..0000000