Merge aedb20afb4 into 4ee2b3ecc7

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"\n"# 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

readme.md

@@ -134,6 +134,25 @@ The agetty service for the tty console where you are running ly should be disabl
 ```
 # rm /var/service/agetty-tty2
 ```
+### s6
+
+```
+$ make
+# make installs6
+# vim (or nano) /etc/s6/config/tty2.conf
+```
+Set `SPAWN="no"`
+Exit and save configuration file.
+
+Note: If ly is configured to run on another tty other than tty2, change the respecting configuration file which can be found in /etc/s6/config
+
+The makefile should add and enable ly by default, but here are the steps to enable the service manually.
+
+```
+# s6-service add default ly-srv
+# s6-db-reload
+# s6-rc -u change ly-srv
+```
 
 ## Arch Linux Installation
 You can install ly from the [`[extra]` repos](https://archlinux.org/packages/extra/x86_64/ly/):

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".

res/ly-s6/run

@@ -0,0 +1,2 @@
+#!/bin/execlineb -P
+exec agetty -L -8 -n -l /usr/bin/ly tty2 115200

res/ly-s6/type

@@ -0,0 +1 @@
+longrun