s6: minor cleanups

The "live" bundle is pointless and superfluous. Remove it. Also, the pacman-init up oneshot had a useless fdmove line in it. Remove that as well.
8 months ago · 91f8c5d64a
4 changed files with 0 additions and 11 deletions
--- a/7
+++ b/7
@ -42,10 +42,6 @@ S6_PI = \
 	data/s6/pacman-init/up \
 	data/s6/pacman-init/down

-S6_BUNDLE = \
-	data/s6/live/type \
-	data/s6/live/contents
-
 66_LIVE = \
 	data/66/artix-live

@ -125,9 +121,6 @@ install_s6:
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live
 	install $(BMODE) $(S6_LIVE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live/

-	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/live
-	install $(BMODE) $(S6_BUNDLE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/live/
-
 install_66:
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/66/service

--- a/data/s6/live/contents
+++ b/data/s6/live/contents
@ -1,2 +0,0 @@
-artix-live
-pacman-init
--- a/data/s6/live/type
+++ b/data/s6/live/type
@ -1 +0,0 @@
-bundle
--- a/data/s6/pacman-init/up.in
+++ b/data/s6/pacman-init/up.in
@ -1,6 +1,5 @@
 #!@bindir@/execlineb -P
 foreground { mkdir -p /etc/pacman.d/gnupg }
 foreground { mount -t tmpfs -o size=10M,mode=0755 tmpfs /etc/pacman.d/gnupg }
-fdmove -c 2 1
 foreground { pacman-key --init }
 foreground { pacman-key --populate artix }