RomanNum3ral
/
ly
mirror of https://github.com/fairyglade/ly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tidy up runit service scripts (#479) 

* Fix the script installation path (install everything only on /etc/sv/ly)

* Update the runit scripts to get the TTY value from the /etc/ly/config.ini file

* Update readme.md
This commit is contained in:
Bruno Rodríguez 2023-06-14 21:42:01 +02:00 committed by GitHub
parent 8c4ba3bd40
commit a8ea5d3e99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefile
View File

@ -100,7 +100,6 @@ installopenrc:
installrunit:
@echo "installing runit service"
@install -dZ ${DESTDIR}/etc/sv/ly-runit-service
@install -DZ $(RESD)/ly-runit-service/* -t ${DESTDIR}/etc/sv/ly
uninstall:
@ -111,6 +110,7 @@ uninstall:
@rm -f ${DESTDIR}/usr/lib/systemd/system/ly.service
@rm -f ${DESTDIR}/etc/pam.d/ly
@rm -f ${DESTDIR}/etc/init.d/${NAME}
@rm -rf ${DESTDIR}/etc/sv/ly
clean:
@echo "cleaning"

6
readme.md
View File

@ -120,13 +120,15 @@ $ make
# ln -s /etc/sv/ly /var/service/
```
Disable your existing display manager service if need be e.g.:
By default, ly will run on tty2. To change the tty it must be set in `/etc/ly/config.ini`
You should as well disable your existing display manager service if needed, e.g.:
```
# rm /var/service/lxdm
```
If you are running on `tty2` (check your `/etc/ly/config.ini`) you can disable e.g. `agetty` running there:
The agetty service for the tty console where you are running ly should be disabled. For instance, if you are running ly on tty2 (that's the default, check your `/etc/ly/config.ini`) you should disable the agetty-tty2 service like this:
```
# rm /var/service/agetty-tty2

6
res/ly-runit-service/conf
View File

@ -8,7 +8,5 @@ fi
BAUD_RATE=38400
TERM_NAME=linux
StandardInput=tty
TTYPath=/dev/tty2
TTYReset=yes
TTYVHangup=yes
auxtty=$(/bin/cat /etc/ly/config.ini 2>/dev/null 1| /bin/sed -n 's/\(^[[:space:]]*tty[[:space:]]*=[[:space:]]*\)\([[:digit:]][[:digit:]]*\)\(.*\)/\2/p')
TTY=tty${auxtty:-2}

5
res/ly-runit-service/finish
View File

@ -1,3 +1,4 @@
#!/bin/sh
tty=${PWD##*-}
exec utmpset -w $tty
[ -r conf ] && . ./conf
exec utmpset -w ${TTY}

4
res/ly-runit-service/run
View File

@ -1,7 +1,5 @@
#!/bin/sh
tty=${PWD##*-}
[ -r conf ] && . ./conf
if [ -x /sbin/getty -o -x /bin/getty ]; then
@ -12,4 +10,4 @@ elif [ -x /sbin/agetty -o -x /bin/agetty ]; then
GETTY=agetty
fi
exec setsid ${GETTY} ${GETTY_ARGS} -nl /usr/bin/ly tty2 "${BAUD_RATE}" "${TERM_NAME}"
exec setsid ${GETTY} ${GETTY_ARGS} -nl /usr/bin/ly "${TTY}" "${BAUD_RATE}" "${TERM_NAME}"