0.12.2

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.

LICENSE

@@ -1,6 +1,6 @@
 BSD 2-Clause License
 
-Copyright (c) 2018-2019, Artix Linux
+Copyright (c) 2018-2021, Artix Linux
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -1,4 +1,4 @@
-VERSION = 0.10
+VERSION = 0.12.2
 
 PKG = live-services
 TOOLS = artools
@@ -42,16 +42,21 @@ 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
 
 66_PI = \
 	data/66/pacman-init
 
+DINIT_LIVE = \
+	data/dinit/artix-live
+
+DINIT_PI = \
+	data/dinit/pacman-init
+
+DINIT_PI_SCRIPT = \
+	data/dinit/pacman-init.script
+
 XDG = $(wildcard data/*.desktop)
 
 XBIN = bin/desktop-items
@@ -116,15 +121,21 @@ 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
 
 	install $(FMODE) $(66_LIVE) $(DESTDIR)$(SYSCONFDIR)/66/service/artix-live
 	install $(FMODE) $(66_PI) $(DESTDIR)$(SYSCONFDIR)/66/service/pacman-init
 
+install_dinit:
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/dinit.d/scripts
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/dinit.d/live.d
+	install $(FMODE) $(DINIT_LIVE) $(DESTDIR)$(SYSCONFDIR)/dinit.d/artix-live
+	install $(FMODE) $(DINIT_PI) $(DESTDIR)$(SYSCONFDIR)/dinit.d/pacman-init
+	install $(BMODE) $(DINIT_PI_SCRIPT) $(DESTDIR)$(SYSCONFDIR)/dinit.d/scripts/pacman-init
+	ln -s ../artix-live $(DESTDIR)$(SYSCONFDIR)/dinit.d/live.d
+	ln -s ../pacman-init $(DESTDIR)$(SYSCONFDIR)/dinit.d/live.d
+
 install_xdg:
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
 	install -m0755 ${XBIN} $(DESTDIR)$(PREFIX)/bin

bin/desktop-items.in

@@ -28,6 +28,10 @@ if [[ -d /run/openrc ]]; then
     ln -s $docs/OpenRC.pdf "$xdg"/OpenRC.pdf
 elif [[ -d /run/runit ]]; then
     ln -s $docs/Runit.pdf "$xdg"/Runit.pdf
+elif [[ -d /run/66 ]]; then
+    ln -s $docs/Suite66.pdf "$xdg"/Suite66.pdf
+elif [[ -d /run/dinit ]]; then
+    ln -s $docs/Dinit.pdf "$xdg"/Dinit.pdf
 else
     ln -s $docs/S6.pdf "$xdg"/S6.pdf
 fi

data/dinit/artix-live

@@ -0,0 +1,4 @@
+type      = scripted
+command   = /usr/bin/artix-live
+restart   = false
+waits-for = setup

data/dinit/pacman-init

@@ -0,0 +1,5 @@
+type         = scripted
+command      = /etc/dinit.d/scripts/pacman-init
+stop-command = /usr/bin/umount -l /etc/pacman.d/gnupg
+restart      = false
+waits-for    = setup

data/dinit/pacman-init.script

@@ -0,0 +1,4 @@
+#!/bin/sh
+/usr/bin/mount -t tmpfs -o size=10M,mode=0755 tmpfs /etc/pacman.d/gnupg
+/usr/bin/pacman-key --init
+/usr/bin/pacman-key --populate artix

data/rc/artix-live.in

@@ -1,11 +1,13 @@
 #!/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() {

data/s6/live/contents

@@ -1,2 +0,0 @@
-artix-live
-pacman-init

data/s6/live/type

@@ -1 +0,0 @@
-bundle

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 }