Skip to content

Commit 9cd40a7

Browse files
committed
fixes in the template, 66boot-initial-setup and the runit service
1 parent ca28978 commit 9cd40a7

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

srcpkgs/boot-66serv/files/66boot-initial-setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ msg_trees() {
1818
66-enable -F -t boot boot@system || msg_trees
1919
# Copy the default boot@conf so that is will survive updates and be accesible
2020
# though /etc/66rc.conf.
21-
cp /etc/66/conf/boot@system/version/.boot@system /etc/66/conf/boot@system/version/boot@system || msg_trees
21+
if test ! -f /etc/66/conf/boot@system/version/boot@system; then cp /etc/66/conf/boot@system/version/.boot@system /etc/66/conf/boot@system/version/boot@system ; fi
2222

2323
# Create default tree, enable it and make it current.
2424
66-tree -nEc default || msg_trees

srcpkgs/boot-66serv/files/runit

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@
88
@build = custom
99
@shebang = ( "/bin/sh" )
1010
@execute = (
11-
PATH=/usr/bin
11+
exec 2>&1
1212

13+
PATH=/usr/bin
1314
runlevel=66
1415

1516
runsvchdir "${runlevel}"
1617
s6-mkdir -v -p /run/runit/runsvdir
17-
s6-ln -s /etc/runit/runsvdir/current /run/runit/runsvdir/current
18+
ln -s /etc/runit/runsvdir/current /run/runit/runsvdir/current
19+
s6-rmrf /var/service/current
20+
s6-rmrf /var/service/supervise
1821

1922
exec s6-env -i PATH=$PATH \
2023
runsvdir -P /run/runit/runsvdir/current

srcpkgs/boot-66serv/template

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ version=2.3.0
44
revision=1
55
wrksrc=${pkgname}-v${version}
66
build_style=gnu-configure
7-
configure_args="--HOSTNAME=voidlinux --TTY=!4
8-
--KEYMAP=!us --TZ=Europe/Madrid"
7+
configure_args="--HOSTNAME=!voidlinux --TTY=!4
8+
--KEYMAP=!us --TZ=!Europe/Madrid --TMPFILE=!no
9+
--SWAP=!yes"
910
make_install_target="install install-man install-html"
1011
hostmakedepends="lowdown"
1112
makedepends="file"

0 commit comments

Comments
 (0)