From 5a26d99913c0eef5d8e2be8a1b0a5509e2b72815 Mon Sep 17 00:00:00 2001
From: userbook <userbook@devuan>
Date: Wed, 31 Jan 2024 14:46:07 -0500
Subject: [PATCH] added service files and changed makefile for s6 support

---
 makefile             | 7 +++++++
 res/ly-s6/README.txt | 3 +++
 res/ly-s6/run        | 2 ++
 res/ly-s6/type       | 1 +
 4 files changed, 13 insertions(+)
 create mode 100644 res/ly-s6/README.txt
 create mode 100644 res/ly-s6/run
 create mode 100644 res/ly-s6/type

diff --git a/makefile b/makefile
index b59470d..116f5eb 100644
--- a/makefile
+++ b/makefile
@@ -104,6 +104,13 @@ installrunit:
 	@echo "installing runit service"
 	@install -DZ $(RESD)/ly-runit-service/* -t ${DESTDIR}/etc/sv/ly
 
+installs6:
+	@echo "installing s6 service"
+	@echo "\tIMPORTANT: PLEASE READ CAREFULLY!\nLy will not function properly if tty2 or the one set in config isn't disabled. \nTo do this edit "/etc/s6/config/tty2.conf" and set ' SPAWN="no" '\nThen either reboot the system or run in order\n"s6-rc -d change tty2", "kill $$\(pgrep ly-dm\)", "s6-rc -u change ly-srv"."
+	@touch ${DESTDIR}/etc/s6/adminsv/default/contents.d/ly-srv
+	@install -DZ $(RESD)/ly-s6/* -t ${DESTDIR}/etc/s6/sv/ly-srv
+	@s6-db-reload
+
 uninstall:
 	@echo "uninstalling"
 	@rm -rf ${DESTDIR}/etc/ly
diff --git a/res/ly-s6/README.txt b/res/ly-s6/README.txt
new file mode 100644
index 0000000..e724098
--- /dev/null
+++ b/res/ly-s6/README.txt
@@ -0,0 +1,3 @@
+Ly will not function properly if tty2 or the one set in config isn't disabled.
+To do this edit "/etc/s6/config/tty2.conf" and set ' SPAWN="no" '
+Then either reboot the system or run in order "s6-rc -d change tty2", "kill $(pgrep ly-dm)", "s6-rc -u change ly-srv".
diff --git a/res/ly-s6/run b/res/ly-s6/run
new file mode 100644
index 0000000..84a8de5
--- /dev/null
+++ b/res/ly-s6/run
@@ -0,0 +1,2 @@
+#!/bin/execlineb -P
+exec agetty -L -8 -n -l /usr/bin/ly-dm tty2 115200
diff --git a/res/ly-s6/type b/res/ly-s6/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/res/ly-s6/type
@@ -0,0 +1 @@
+longrun