rc: use a display-manager provide

Update 'bin/desktop-items.in'
s6: minor cleanups
2022-01-04 18:04:25 +01:00 · 2021-12-31 20:59:30 +01:00 · 2021-12-30 18:02:30 -06:00 · 2021-12-31 00:14:12 +02:00 · 2021-12-30 23:12:40 +02:00 · 2021-12-22 02:32:57 +02:00
7 changed files with 8 additions and 17 deletions
--- a/9
+++ b/9
@@ -1,4 +1,4 @@
-VERSION = 0.11.3
+VERSION = 0.12

 PKG = live-services
 TOOLS = artools
@@ -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/README.md
+++ b/README.md
@@ -1 +1 @@
-# live-services
+# live-services
--- a/bin/desktop-items.in
+++ b/bin/desktop-items.in
@@ -31,7 +31,7 @@ elif [[ -d /run/runit ]]; then
 elif [[ -d /run/66 ]]; then
    ln -s $docs/Suite66.pdf "$xdg"/Suite66.pdf
 elif [[ -d /run/dinit ]]; then
-    ln -s $docs/Dinit.pdf "$xdg"/Suite66.pdf
+    ln -s $docs/Dinit.pdf "$xdg"/Dinit.pdf
 else
    ln -s $docs/S6.pdf "$xdg"/S6.pdf
 fi
--- a/data/rc/artix-live.in
+++ b/data/rc/artix-live.in
@@ -1,15 +1,17 @@
 #!/usr/bin/openrc-run
 # Copyright 2014 Aaditya Bagga (aaditya_gnulinux@zoho.com)
+# Copyright 2017-2021 The Artix Linux developers
 # Distributed under the terms of the GNU General Public License v2

 description="LiveMedia Config Script"

 depend() {
    need localmount
+    before display-manager ly
 }

 start() {
-	ebegin "Starting artix live script"
-	/usr/bin/artix-live
-	eend $?
+    ebegin "Starting artix live script"
+    /usr/bin/artix-live
+    eend $?
 }
--- 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 }
Author	SHA1	Message	Date
artoo	231acc723b	rc: use a display-manager provide	2022-01-04 18:04:25 +01:00
nous	dafee38770	Update 'bin/desktop-items.in'	2021-12-31 20:59:30 +01:00
dudemanguy	91f8c5d64a	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.	2021-12-30 18:02:30 -06:00
nous	0bff2c5715	complete list	2021-12-31 00:14:12 +02:00
nous	88ebe2ee63	openrc: start before display manager	2021-12-30 23:12:40 +02:00
nous	d253e889c5	0.12	2021-12-22 02:32:57 +02:00