13 Commits

Author SHA1 Message Date
be5c4f8c45 call proper sh lib 2024-04-21 15:31:55 +02:00
5b6b2b333b set sv name defaults 2024-04-21 15:28:14 +02:00
42079b4149 drop local scripts 2024-04-21 15:20:11 +02:00
cddbda97aa upd sv cg 2024-04-21 15:18:56 +02:00
94ea2fe509 rm leftovers 2024-04-20 22:27:50 +02:00
5c0a46baff upd deps 2024-04-20 22:26:33 +02:00
c2b343f55e update deps 2024-04-20 22:23:53 +02:00
1b9fb8a8db add sv cg settings 2024-04-20 21:48:26 +02:00
9bc59c1106 update cg oneshots 2024-04-20 21:14:22 +02:00
180eca1cc6 add elogind cg 2024-04-20 20:59:55 +02:00
3bb69889e6 add dbus sv 2024-04-20 20:58:20 +02:00
a799e8ac78 add up/down 2024-04-20 20:50:18 +02:00
5bafd95c27 add sv cg oneshots 2024-04-20 20:30:26 +02:00
88 changed files with 687 additions and 45 deletions

2
.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
generic/

View File

@@ -21,8 +21,15 @@ CONFIG = \
convfile \
dmesg.conf \
hwclock.conf \
mount-cgroups.conf \
mount-tmpfs.conf \
network-detection.conf \
tty1.conf \
tty2.conf \
tty3.conf \
tty4.conf \
tty5.conf \
tty6.conf \
ttyS.conf \
udevd.conf
@@ -61,7 +68,12 @@ SYSCTLDIR = sysctl
SYSUSERSDIR = sysusers
TMPFILESDEVDIR = tmpfiles-dev
TMPFILESSETUPDIR = tmpfiles-setup
TTYDIRS = tty1 tty2 tty3 tty4 tty5 tty6
TTY1DIR = tty1
TTY2DIR = tty2
TTY3DIR = tty3
TTY4DIR = tty4
TTY5DIR = tty5
TTY6DIR = tty6
TTYSDIR = ttyS
UDEVDIR = udev
UDEVADMDIR = udevadm
@@ -130,8 +142,18 @@ TMPFILESDEV = $(subst tmpfiles-dev/dependencies.d,, $(wildcard tmpfiles-dev/*))
TMPFILESDEVDEPS = $(wildcard tmpfiles-dev/*/*)
TMPFILESSETUP = $(subst tmpfiles-setup/dependencies.d,, $(wildcard tmpfiles-setup/*))
TMPFILESSETUPDEPS = $(wildcard tmpfiles-setup/*/*)
TTY = $(subst tty/dependencies.d,, $(wildcard tty/*))
TTYDEPS = $(wildcard tty/*/*)
TTY1 = $(subst tty1/dependencies.d,, $(wildcard tty1/*))
TTY1DEPS = $(wildcard tty1/*/*)
TTY2 = $(subst tty2/dependencies.d,, $(wildcard tty2/*))
TTY2DEPS = $(wildcard tty2/*/*)
TTY3 = $(subst tty3/dependencies.d,, $(wildcard tty3/*))
TTY3DEPS = $(wildcard tty3/*/*)
TTY4 = $(subst tty4/dependencies.d,, $(wildcard tty4/*))
TTY4DEPS = $(wildcard tty4/*/*)
TTY5 = $(subst tty5/dependencies.d,, $(wildcard tty5/*))
TTY5DEPS = $(wildcard tty5/*/*)
TTY6 = $(subst tty6/dependencies.d,, $(wildcard tty6/*))
TTY6DEPS = $(wildcard tty6/*/*)
TTYS = $(subst ttyS/dependencies.d,, $(wildcard ttyS/*))
TTYSDEPS = $(wildcard ttyS/*/*)
UDEV = $(subst udev/contents.d,, $(wildcard udev/*))
@@ -152,10 +174,6 @@ install_s6:
install $(MODE) $(CONFIG) $(DESTDIR)$(CONFIGDIR)
for dir in $(TTYDIRS); do \
install $(MODE) tty.conf $(DESTDIR)$(CONFIGDIR)/$$dir.conf; \
done;
install $(MODE) $(RC) $(DESTDIR)$(S6DIR)
install $(MODE) $(LOGRELOAD) $(DESTDIR)$(S6DIR)
@@ -316,12 +334,29 @@ install_s6:
install $(MODE) $(TMPFILESSETUP) $(DESTDIR)$(SVDIR)/$(TMPFILESSETUPDIR)
install $(MODE) $(TMPFILESSETUPDEPS) $(DESTDIR)$(SVDIR)/$(TMPFILESSETUPDIR)/dependencies.d
for dir in $(TTYDIRS); do \
install $(DIRMODE) $(DESTDIR)$(SVDIR)/$$dir/dependencies.d; \
install $(MODE) $(TTY) $(DESTDIR)$(SVDIR)/$$dir; \
install $(MODE) $(TTYDEPS) $(DESTDIR)$(SVDIR)/$$dir/dependencies.d; \
sed -i "s/TTYDIR/$$dir/" $(DESTDIR)$(SVDIR)/$$dir/run; \
done;
install $(DIRMODE) $(DESTDIR)$(SVDIR)/$(TTY1DIR)/dependencies.d
install $(MODE) $(TTY1) $(DESTDIR)$(SVDIR)/$(TTY1DIR)
install $(MODE) $(TTY1DEPS) $(DESTDIR)$(SVDIR)/$(TTY1DIR)/dependencies.d
install $(DIRMODE) $(DESTDIR)$(SVDIR)/$(TTY2DIR)/dependencies.d
install $(MODE) $(TTY2) $(DESTDIR)$(SVDIR)/$(TTY2DIR)
install $(MODE) $(TTY2DEPS) $(DESTDIR)$(SVDIR)/$(TTY2DIR)/dependencies.d
install $(DIRMODE) $(DESTDIR)$(SVDIR)/$(TTY3DIR)/dependencies.d
install $(MODE) $(TTY3) $(DESTDIR)$(SVDIR)/$(TTY3DIR)
install $(MODE) $(TTY3DEPS) $(DESTDIR)$(SVDIR)/$(TTY3DIR)/dependencies.d
install $(DIRMODE) $(DESTDIR)$(SVDIR)/$(TTY4DIR)/dependencies.d
install $(MODE) $(TTY4) $(DESTDIR)$(SVDIR)/$(TTY4DIR)
install $(MODE) $(TTY4DEPS) $(DESTDIR)$(SVDIR)/$(TTY4DIR)/dependencies.d
install $(DIRMODE) $(DESTDIR)$(SVDIR)/$(TTY5DIR)/dependencies.d
install $(MODE) $(TTY5) $(DESTDIR)$(SVDIR)/$(TTY5DIR)
install $(MODE) $(TTY5DEPS) $(DESTDIR)$(SVDIR)/$(TTY5DIR)/dependencies.d
install $(DIRMODE) $(DESTDIR)$(SVDIR)/$(TTY6DIR)/dependencies.d
install $(MODE) $(TTY6) $(DESTDIR)$(SVDIR)/$(TTY6DIR)
install $(MODE) $(TTY6DEPS) $(DESTDIR)$(SVDIR)/$(TTY6DIR)/dependencies.d
install $(DIRMODE) $(DESTDIR)$(SVDIR)/$(TTYSDIR)/dependencies.d
install $(MODE) $(TTYS) $(DESTDIR)$(SVDIR)/$(TTYSDIR)

9
dbus-cg/down Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/execlineb -P
envfile /etc/s6/config/dbus.conf
importas -uD "dbus" SV_NAME
importas -uD "" SV_CG_SEND_SIGHUP
importas -uD "" SV_CG_TIMEOUT_STOPSEC
importas -uD "" SV_CG_SEND_SIGKILL
exec sh /usr/lib/artix/sv-cg.sh down $SV_NAME $SV_CG_SEND_SIGHUP $SV_CG_TIMEOUT_STOPSEC $SV_CG_SEND_SIGKILL

1
dbus-cg/type Normal file
View File

@@ -0,0 +1 @@
oneshot

7
dbus-cg/up Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/execlineb -P
envfile /etc/s6/config/dbus.conf
importas -uD "dbus" SV_NAME
importas -uD "" SV_CG_SETTINGS
exec sh /usr/lib/artix/sv-cg.sh up $SV_NAME $SV_CG_SETTINGS

1
dbus-log/consumer-for Normal file
View File

@@ -0,0 +1 @@
dbus-srv

1
dbus-log/notification-fd Normal file
View File

@@ -0,0 +1 @@
3

1
dbus-log/pipeline-name Normal file
View File

@@ -0,0 +1 @@
dbus

9
dbus-log/run Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/execlineb -P
envfile /etc/s6/config/dbus.conf
importas -sCuD "n3 s2000000 T" DIRECTIVES DIRECTIVES
ifelse { test -w /var/log } {
foreground { install -d -o s6log -g s6log /var/log/dbus }
s6-setuidgid s6log exec -c s6-log -d3 -b -- ${DIRECTIVES} /var/log/dbus
}
foreground { install -d -o s6log -g s6log /run/log/dbus }
s6-setuidgid s6log exec -c s6-log -d3 -b -- ${DIRECTIVES} /run/log/dbus

1
dbus-srv/notification-fd Normal file
View File

@@ -0,0 +1 @@
3

1
dbus-srv/producer-for Normal file
View File

@@ -0,0 +1 @@
dbus-log

11
dbus-srv/run Normal file
View File

@@ -0,0 +1,11 @@
#!/bin/execlineb -P
foreground { dbus-uuidgen --ensure=/etc/machine-id }
foreground { install -m755 -g 81 -o 81 -d /run/dbus }
foreground {
envfile /etc/s6/config/dbus.conf
importas -uD "no" DBUS_UUIDGEN DBUS_UUIDGEN
if { test ${DBUS_UUIDGEN} = "yes" }
redirfd -w 1 /etc/machine-id dbus-uuidgen
}
fdmove -c 2 1
exec dbus-daemon --system --nofork --nopidfile --print-pid=3

1
dbus-srv/type Normal file
View File

@@ -0,0 +1 @@
longrun

42
dbus.conf Normal file
View File

@@ -0,0 +1,42 @@
# Set to "yes" to regenerate the dbus machine id everytime the service
# is brought up. The dbus documentation only expects the machine id to
# persist during one boot session however systemd says it must persist
# across every boot (i.e. never change). While many applications only
# care if the machine-id is consistent during runtime, there are some
# that do expect it to always stay the same.
DBUS_UUIDGEN="no"
# This configures the directives used for s6-log in the log service.
DIRECTIVES="n3 s2000000 T"
# This variable contains the cgroups version 2 settings for your services.
# If this is set in this file, the settings will apply to all services.
# If you want different settings for each service, place the settings in
# /etc/conf.d/foo for service foo.
# The format is to specify the setting and value followed by a newline.
# Multiple settings and values can be specified.
# For example, you would use this to set the maximum memory and maximum
# number of pids for a service.
#SV_CG_SETTINGS="
#memory.max 10485760
#pids.max max
#"
#
# For more information about the adjustments that can be made with
# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
# source tree.
#SV_CG_SETTINGS=""
# If this is yes, we will send sighup to the processes in the cgroup
# immediately after stopsig and sigcont.
#SV_CG_SEND_SIGHUP="NO"
# This is the amount of time in seconds that we delay after sending sigcont
# and optionally sighup, before we optionally send sigkill to all
# processes in the # cgroup.
# The default is 90 seconds.
#SV_CG_TIMEOUT_STOPSEC="90"
# If this is set to no, we do not send sigkill to all processes in the
# cgroup.
#SV_CG_SEND_SIGKILL="YES"

9
elogind-cg/down Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/execlineb -P
envfile /etc/s6/config/elogind.conf
importas -uD "elogind" SV_NAME
importas -uD "" SV_CG_SEND_SIGHUP
importas -uD "" SV_CG_TIMEOUT_STOPSEC
importas -uD "" SV_CG_SEND_SIGKILL
exec sh /usr/lib/artix/sv-cg.sh down $SV_NAME $SV_CG_SEND_SIGHUP $SV_CG_TIMEOUT_STOPSEC $SV_CG_SEND_SIGKILL

1
elogind-cg/type Normal file
View File

@@ -0,0 +1 @@
oneshot

7
elogind-cg/up Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/execlineb -P
envfile /etc/s6/config/elogind.conf
importas -uD "elogind" SV_NAME
importas -uD "" SV_CG_SETTINGS
exec sh /usr/lib/artix/sv-cg.sh up $SV_NAME $SV_CG_SETTINGS

31
elogind.conf Normal file
View File

@@ -0,0 +1,31 @@
# This variable contains the cgroups version 2 settings for your services.
# If this is set in this file, the settings will apply to all services.
# If you want different settings for each service, place the settings in
# /etc/conf.d/foo for service foo.
# The format is to specify the setting and value followed by a newline.
# Multiple settings and values can be specified.
# For example, you would use this to set the maximum memory and maximum
# number of pids for a service.
#SV_CG_SETTINGS="
#memory.max 10485760
#pids.max max
#"
#
# For more information about the adjustments that can be made with
# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
# source tree.
#SV_CG_SETTINGS=""
# If this is yes, we will send sighup to the processes in the cgroup
# immediately after stopsig and sigcont.
#SV_CG_SEND_SIGHUP="NO"
# This is the amount of time in seconds that we delay after sending sigcont
# and optionally sighup, before we optionally send sigkill to all
# processes in the # cgroup.
# The default is 90 seconds.
#SV_CG_TIMEOUT_STOPSEC="90"
# If this is set to no, we do not send sigkill to all processes in the
# cgroup.
#SV_CG_SEND_SIGKILL="YES"

View File

2
elogind/run Normal file
View File

@@ -0,0 +1,2 @@
#!/bin/execlineb -P
exec /usr/lib/elogind/elogind

1
elogind/type Normal file
View File

@@ -0,0 +1 @@
longrun

19
mount-cgroups.conf Normal file
View File

@@ -0,0 +1,19 @@
# cgroups mode
# legacy mounts cgroups version 1 on /sys/fs/cgroup
# unified mounts cgroups version 2 on /sys/fs/cgroup
# hybrid mounts cgroups version 2 on /sys/fs/cgroup/unified and
# cgroups version 1 on /sys/fs/cgroup
CGROUP_MODE=unified
# This is a list of controllers which should be enabled for cgroups version 2.
# If hybrid mode is being used, controllers listed here will not be
# available for cgroups version 1. none means no controllers will be used
CGROUP_CONTROLLERS=none
# This switch controls whether or not cgroups version 1 controllers are
# individually mounted under
# /sys/fs/cgroup in hybrid or legacy mode
HAVE_CONTROLLER1_GROUPS=true

View File

@@ -1,2 +1,6 @@
#!/bin/execlineb -P
exec sh /usr/lib/artix/mount-cgroups.sh
envfile /etc/s6/config/mount-cgroups.conf
importas -uD "unified" CGROUP_MODE CGROUP_MODE
importas -uD "none" CGROUP_CONTROLLERS CGROUP_CONTROLLERS
importas -uD "true" HAVE_CONTROLLER1_GROUPS HAVE_CONTROLLER1_GROUPS
exec sh /usr/lib/artix/mount-cgroups.sh $CGROUP_MODE $CGROUP_CONTROLLERS $HAVE_CONTROLLER1_GROUPS

View File

@@ -7,26 +7,6 @@ foreground {
if -n { mountpoint -q /sys/kernel/security }
mount -n -t securityfs securityfs /sys/kernel/security
}
foreground {
if { test -d /sys/kernel/debug }
if -n { mountpoint -q /sys/kernel/debug }
mount -n -t debugfs -o nosuid,noexec,nodev debugfs /sys/kernel/debug
}
foreground {
if { test -d /sys/kernel/config }
if -n { mountpoint -q /sys/kernel/config }
mount -n -t configfs -o nosuid,noexec,nodev configfs /sys/kernel/config
}
foreground {
if { test -d /sys/fs/fuse/connections }
if -n { mountpoint -q /sys/fs/fuse/connections }
mount -n -t fusectl -o nosuid,noexec,nodev fusectl /sys/fs/fuse/connections
}
foreground {
if { test -d /sys/fs/pstore }
if -n { mountpoint -q /sys/fs/pstore }
mount -t pstore pstore -o nosuid,noexec,nodev /sys/fs/pstore
}
foreground {
if { test -d /sys/firmware/efi }
if -n { mountpoint -q /sys/firmware/efi/efivars }

View File

@@ -1,8 +0,0 @@
# Option to actually spawn the getty when the service starts. Set to "yes" to enable.
SPAWN="yes"
# Arbitrary arguments to pass to getty.
ARGS=""
# Getty program to use.
GETTY="agetty"

9
tty1-cg/down Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/execlineb -P
envfile /etc/s6/config/tty1.conf
importas -uD "tty1" SV_NAME
importas -uD "" SV_CG_SEND_SIGHUP
importas -uD "" SV_CG_TIMEOUT_STOPSEC
importas -uD "" SV_CG_SEND_SIGKILL
exec sh /usr/lib/artix/sv-cg.sh down $SV_NAME $SV_CG_SEND_SIGHUP $SV_CG_TIMEOUT_STOPSEC $SV_CG_SEND_SIGKILL

1
tty1-cg/type Normal file
View File

@@ -0,0 +1 @@
oneshot

7
tty1-cg/up Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/execlineb -P
envfile /etc/s6/config/tty1.conf
importas -uD "tty1" SV_NAME
importas -uD "" SV_CG_SETTINGS
exec sh /usr/lib/artix/sv-cg.sh up $SV_NAME $SV_CG_SETTINGS

40
tty1.conf Normal file
View File

@@ -0,0 +1,40 @@
# Option to actually spawn the getty when the service starts. Set to "yes" to enable.
SPAWN="yes"
# Arbitrary arguments to pass to getty.
ARGS=""
# Getty program to use.
GETTY="agetty"
# This variable contains the cgroups version 2 settings for your services.
# If this is set in this file, the settings will apply to all services.
# If you want different settings for each service, place the settings in
# /etc/conf.d/foo for service foo.
# The format is to specify the setting and value followed by a newline.
# Multiple settings and values can be specified.
# For example, you would use this to set the maximum memory and maximum
# number of pids for a service.
#SV_CG_SETTINGS="
#memory.max 10485760
#pids.max max
#"
#
# For more information about the adjustments that can be made with
# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
# source tree.
#SV_CG_SETTINGS=""
# If this is yes, we will send sighup to the processes in the cgroup
# immediately after stopsig and sigcont.
#SV_CG_SEND_SIGHUP="NO"
# This is the amount of time in seconds that we delay after sending sigcont
# and optionally sighup, before we optionally send sigkill to all
# processes in the # cgroup.
# The default is 90 seconds.
#SV_CG_TIMEOUT_STOPSEC="90"
# If this is set to no, we do not send sigkill to all processes in the
# cgroup.
#SV_CG_SEND_SIGKILL="YES"

View File

View File

View File

View File

@@ -1,9 +1,9 @@
#!/bin/execlineb -P
if { pipeline { s6-rc -ba list } grep -qFx mount-filesystems }
envfile /etc/s6/config/TTYDIR.conf
envfile /etc/s6/config/tty1.conf
importas -uD "yes" SPAWN SPAWN
importas -sCuD "" ARGS ARGS
importas -sCuD "agetty" GETTY GETTY
if -t { test -e /dev/TTYDIR }
if -t { test -e /dev/tty1 }
if -t { test ${SPAWN} = "yes" }
exec ${GETTY} -L -8 TTYDIR 115200 ${ARGS}
exec ${GETTY} -L -8 tty1 115200 ${ARGS}

1
tty1/type Normal file
View File

@@ -0,0 +1 @@
longrun

9
tty2-cg/down Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/execlineb -P
envfile /etc/s6/config/tty2.conf
importas -uD "tty2" SV_NAME
importas -uD "" SV_CG_SEND_SIGHUP
importas -uD "" SV_CG_TIMEOUT_STOPSEC
importas -uD "" SV_CG_SEND_SIGKILL
exec sh /usr/lib/artix/sv-cg.sh down $SV_NAME $SV_CG_SEND_SIGHUP $SV_CG_TIMEOUT_STOPSEC $SV_CG_SEND_SIGKILL

1
tty2-cg/type Normal file
View File

@@ -0,0 +1 @@
oneshot

7
tty2-cg/up Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/execlineb -P
envfile /etc/s6/config/tty2.conf
importas -uD "tty2" SV_NAME
importas -uD "" SV_CG_SETTINGS
exec sh /usr/lib/artix/sv-cg.sh up $SV_NAME $SV_CG_SETTINGS

40
tty2.conf Normal file
View File

@@ -0,0 +1,40 @@
# Option to actually spawn the getty when the service starts. Set to "yes" to enable.
SPAWN="yes"
# Arbitrary arguments to pass to getty.
ARGS=""
# Getty program to use.
GETTY="agetty"
# This variable contains the cgroups version 2 settings for your services.
# If this is set in this file, the settings will apply to all services.
# If you want different settings for each service, place the settings in
# /etc/conf.d/foo for service foo.
# The format is to specify the setting and value followed by a newline.
# Multiple settings and values can be specified.
# For example, you would use this to set the maximum memory and maximum
# number of pids for a service.
#SV_CG_SETTINGS="
#memory.max 10485760
#pids.max max
#"
#
# For more information about the adjustments that can be made with
# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
# source tree.
#SV_CG_SETTINGS=""
# If this is yes, we will send sighup to the processes in the cgroup
# immediately after stopsig and sigcont.
#SV_CG_SEND_SIGHUP="NO"
# This is the amount of time in seconds that we delay after sending sigcont
# and optionally sighup, before we optionally send sigkill to all
# processes in the # cgroup.
# The default is 90 seconds.
#SV_CG_TIMEOUT_STOPSEC="90"
# If this is set to no, we do not send sigkill to all processes in the
# cgroup.
#SV_CG_SEND_SIGKILL="YES"

View File

View File

View File

9
tty2/run Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/execlineb -P
if { pipeline { s6-rc -ba list } grep -qFx mount-filesystems }
envfile /etc/s6/config/tty2.conf
importas -uD "yes" SPAWN SPAWN
importas -sCuD "" ARGS ARGS
importas -sCuD "agetty" GETTY GETTY
if -t { test -e /dev/tty2 }
if -t { test ${SPAWN} = "yes" }
exec ${GETTY} -L -8 tty2 115200 ${ARGS}

1
tty2/type Normal file
View File

@@ -0,0 +1 @@
longrun

9
tty3-cg/down Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/execlineb -P
envfile /etc/s6/config/tty3.conf
importas -uD "tty3" SV_NAME
importas -uD "" SV_CG_SEND_SIGHUP
importas -uD "" SV_CG_TIMEOUT_STOPSEC
importas -uD "" SV_CG_SEND_SIGKILL
exec sh /usr/lib/artix/sv-cg.sh down $SV_NAME $SV_CG_SEND_SIGHUP $SV_CG_TIMEOUT_STOPSEC $SV_CG_SEND_SIGKILL

1
tty3-cg/type Normal file
View File

@@ -0,0 +1 @@
oneshot

7
tty3-cg/up Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/execlineb -P
envfile /etc/s6/config/tty3.conf
importas -uD "tty3" SV_NAME
importas -uD "" SV_CG_SETTINGS
exec sh /usr/lib/artix/sv-cg.sh up $SV_NAME $SV_CG_SETTINGS

40
tty3.conf Normal file
View File

@@ -0,0 +1,40 @@
# Option to actually spawn the getty when the service starts. Set to "yes" to enable.
SPAWN="yes"
# Arbitrary arguments to pass to getty.
ARGS=""
# Getty program to use.
GETTY="agetty"
# This variable contains the cgroups version 2 settings for your services.
# If this is set in this file, the settings will apply to all services.
# If you want different settings for each service, place the settings in
# /etc/conf.d/foo for service foo.
# The format is to specify the setting and value followed by a newline.
# Multiple settings and values can be specified.
# For example, you would use this to set the maximum memory and maximum
# number of pids for a service.
#SV_CG_SETTINGS="
#memory.max 10485760
#pids.max max
#"
#
# For more information about the adjustments that can be made with
# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
# source tree.
#SV_CG_SETTINGS=""
# If this is yes, we will send sighup to the processes in the cgroup
# immediately after stopsig and sigcont.
#SV_CG_SEND_SIGHUP="NO"
# This is the amount of time in seconds that we delay after sending sigcont
# and optionally sighup, before we optionally send sigkill to all
# processes in the # cgroup.
# The default is 90 seconds.
#SV_CG_TIMEOUT_STOPSEC="90"
# If this is set to no, we do not send sigkill to all processes in the
# cgroup.
#SV_CG_SEND_SIGKILL="YES"

View File

View File

View File

9
tty3/run Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/execlineb -P
if { pipeline { s6-rc -ba list } grep -qFx mount-filesystems }
envfile /etc/s6/config/tty3.conf
importas -uD "yes" SPAWN SPAWN
importas -sCuD "" ARGS ARGS
importas -sCuD "agetty" GETTY GETTY
if -t { test -e /dev/tty3 }
if -t { test ${SPAWN} = "yes" }
exec ${GETTY} -L -8 tty3 115200 ${ARGS}

1
tty3/type Normal file
View File

@@ -0,0 +1 @@
longrun

9
tty4-cg/down Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/execlineb -P
envfile /etc/s6/config/tty4.conf
importas -uD "tty4" SV_NAME
importas -uD "" SV_CG_SEND_SIGHUP
importas -uD "" SV_CG_TIMEOUT_STOPSEC
importas -uD "" SV_CG_SEND_SIGKILL
exec sh /usr/lib/artix/sv-cg.sh down $SV_NAME $SV_CG_SEND_SIGHUP $SV_CG_TIMEOUT_STOPSEC $SV_CG_SEND_SIGKILL

1
tty4-cg/type Normal file
View File

@@ -0,0 +1 @@
oneshot

7
tty4-cg/up Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/execlineb -P
envfile /etc/s6/config/tty4.conf
importas -uD "tty4" SV_NAME
importas -uD "" SV_CG_SETTINGS
exec sh /usr/lib/artix/sv-cg.sh up $SV_NAME $SV_CG_SETTINGS

40
tty4.conf Normal file
View File

@@ -0,0 +1,40 @@
# Option to actually spawn the getty when the service starts. Set to "yes" to enable.
SPAWN="yes"
# Arbitrary arguments to pass to getty.
ARGS=""
# Getty program to use.
GETTY="agetty"
# This variable contains the cgroups version 2 settings for your services.
# If this is set in this file, the settings will apply to all services.
# If you want different settings for each service, place the settings in
# /etc/conf.d/foo for service foo.
# The format is to specify the setting and value followed by a newline.
# Multiple settings and values can be specified.
# For example, you would use this to set the maximum memory and maximum
# number of pids for a service.
#SV_CG_SETTINGS="
#memory.max 10485760
#pids.max max
#"
#
# For more information about the adjustments that can be made with
# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
# source tree.
#SV_CG_SETTINGS=""
# If this is yes, we will send sighup to the processes in the cgroup
# immediately after stopsig and sigcont.
#SV_CG_SEND_SIGHUP="NO"
# This is the amount of time in seconds that we delay after sending sigcont
# and optionally sighup, before we optionally send sigkill to all
# processes in the # cgroup.
# The default is 90 seconds.
#SV_CG_TIMEOUT_STOPSEC="90"
# If this is set to no, we do not send sigkill to all processes in the
# cgroup.
#SV_CG_SEND_SIGKILL="YES"

View File

View File

View File

9
tty4/run Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/execlineb -P
if { pipeline { s6-rc -ba list } grep -qFx mount-filesystems }
envfile /etc/s6/config/tty4.conf
importas -uD "yes" SPAWN SPAWN
importas -sCuD "" ARGS ARGS
importas -sCuD "agetty" GETTY GETTY
if -t { test -e /dev/tty4 }
if -t { test ${SPAWN} = "yes" }
exec ${GETTY} -L -8 tty4 115200 ${ARGS}

1
tty4/type Normal file
View File

@@ -0,0 +1 @@
longrun

9
tty5-cg/down Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/execlineb -P
envfile /etc/s6/config/tty5.conf
importas -uD "tty5" SV_NAME
importas -uD "" SV_CG_SEND_SIGHUP
importas -uD "" SV_CG_TIMEOUT_STOPSEC
importas -uD "" SV_CG_SEND_SIGKILL
exec sh /usr/lib/artix/sv-cg.sh down $SV_NAME $SV_CG_SEND_SIGHUP $SV_CG_TIMEOUT_STOPSEC $SV_CG_SEND_SIGKILL

1
tty5-cg/type Normal file
View File

@@ -0,0 +1 @@
oneshot

7
tty5-cg/up Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/execlineb -P
envfile /etc/s6/config/tty5.conf
importas -uD "tty5" SV_NAME
importas -uD "" SV_CG_SETTINGS
exec sh /usr/lib/artix/sv-cg.sh up $SV_NAME $SV_CG_SETTINGS

40
tty5.conf Normal file
View File

@@ -0,0 +1,40 @@
# Option to actually spawn the getty when the service starts. Set to "yes" to enable.
SPAWN="yes"
# Arbitrary arguments to pass to getty.
ARGS=""
# Getty program to use.
GETTY="agetty"
# This variable contains the cgroups version 2 settings for your services.
# If this is set in this file, the settings will apply to all services.
# If you want different settings for each service, place the settings in
# /etc/conf.d/foo for service foo.
# The format is to specify the setting and value followed by a newline.
# Multiple settings and values can be specified.
# For example, you would use this to set the maximum memory and maximum
# number of pids for a service.
#SV_CG_SETTINGS="
#memory.max 10485760
#pids.max max
#"
#
# For more information about the adjustments that can be made with
# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
# source tree.
#SV_CG_SETTINGS=""
# If this is yes, we will send sighup to the processes in the cgroup
# immediately after stopsig and sigcont.
#SV_CG_SEND_SIGHUP="NO"
# This is the amount of time in seconds that we delay after sending sigcont
# and optionally sighup, before we optionally send sigkill to all
# processes in the # cgroup.
# The default is 90 seconds.
#SV_CG_TIMEOUT_STOPSEC="90"
# If this is set to no, we do not send sigkill to all processes in the
# cgroup.
#SV_CG_SEND_SIGKILL="YES"

View File

View File

View File

9
tty5/run Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/execlineb -P
if { pipeline { s6-rc -ba list } grep -qFx mount-filesystems }
envfile /etc/s6/config/tty5.conf
importas -uD "yes" SPAWN SPAWN
importas -sCuD "" ARGS ARGS
importas -sCuD "agetty" GETTY GETTY
if -t { test -e /dev/tty5 }
if -t { test ${SPAWN} = "yes" }
exec ${GETTY} -L -8 tty5 115200 ${ARGS}

1
tty5/type Normal file
View File

@@ -0,0 +1 @@
longrun

9
tty6-cg/down Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/execlineb -P
envfile /etc/s6/config/tty6.conf
importas -uD "tty6" SV_NAME
importas -uD "" SV_CG_SEND_SIGHUP
importas -uD "" SV_CG_TIMEOUT_STOPSEC
importas -uD "" SV_CG_SEND_SIGKILL
exec sh /usr/lib/artix/sv-cg.sh down $SV_NAME $SV_CG_SEND_SIGHUP $SV_CG_TIMEOUT_STOPSEC $SV_CG_SEND_SIGKILL

1
tty6-cg/type Normal file
View File

@@ -0,0 +1 @@
oneshot

7
tty6-cg/up Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/execlineb -P
envfile /etc/s6/config/tty6.conf
importas -uD "tty6" SV_NAME
importas -uD "" SV_CG_SETTINGS
exec sh /usr/lib/artix/sv-cg.sh up $SV_NAME $SV_CG_SETTINGS

40
tty6.conf Normal file
View File

@@ -0,0 +1,40 @@
# Option to actually spawn the getty when the service starts. Set to "yes" to enable.
SPAWN="yes"
# Arbitrary arguments to pass to getty.
ARGS=""
# Getty program to use.
GETTY="agetty"
# This variable contains the cgroups version 2 settings for your services.
# If this is set in this file, the settings will apply to all services.
# If you want different settings for each service, place the settings in
# /etc/conf.d/foo for service foo.
# The format is to specify the setting and value followed by a newline.
# Multiple settings and values can be specified.
# For example, you would use this to set the maximum memory and maximum
# number of pids for a service.
#SV_CG_SETTINGS="
#memory.max 10485760
#pids.max max
#"
#
# For more information about the adjustments that can be made with
# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
# source tree.
#SV_CG_SETTINGS=""
# If this is yes, we will send sighup to the processes in the cgroup
# immediately after stopsig and sigcont.
#SV_CG_SEND_SIGHUP="NO"
# This is the amount of time in seconds that we delay after sending sigcont
# and optionally sighup, before we optionally send sigkill to all
# processes in the # cgroup.
# The default is 90 seconds.
#SV_CG_TIMEOUT_STOPSEC="90"
# If this is set to no, we do not send sigkill to all processes in the
# cgroup.
#SV_CG_SEND_SIGKILL="YES"

View File

View File

View File

9
tty6/run Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/execlineb -P
if { pipeline { s6-rc -ba list } grep -qFx mount-filesystems }
envfile /etc/s6/config/tty6.conf
importas -uD "yes" SPAWN SPAWN
importas -sCuD "" ARGS ARGS
importas -sCuD "agetty" GETTY GETTY
if -t { test -e /dev/tty6 }
if -t { test ${SPAWN} = "yes" }
exec ${GETTY} -L -8 tty6 115200 ${ARGS}

1
tty6/type Normal file
View File

@@ -0,0 +1 @@
longrun

View File

@@ -10,3 +10,35 @@ GETTY="agetty"
# Serial tty address and baud rate
TTY="ttyAMA0"
BAUD_RATE="115200"
# This variable contains the cgroups version 2 settings for your services.
# If this is set in this file, the settings will apply to all services.
# If you want different settings for each service, place the settings in
# /etc/conf.d/foo for service foo.
# The format is to specify the setting and value followed by a newline.
# Multiple settings and values can be specified.
# For example, you would use this to set the maximum memory and maximum
# number of pids for a service.
#SV_CG_SETTINGS="
#memory.max 10485760
#pids.max max
#"
#
# For more information about the adjustments that can be made with
# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
# source tree.
#SV_CG_SETTINGS=""
# If this is yes, we will send sighup to the processes in the cgroup
# immediately after stopsig and sigcont.
#SV_CG_SEND_SIGHUP="NO"
# This is the amount of time in seconds that we delay after sending sigcont
# and optionally sighup, before we optionally send sigkill to all
# processes in the # cgroup.
# The default is 90 seconds.
#SV_CG_TIMEOUT_STOPSEC="90"
# If this is set to no, we do not send sigkill to all processes in the
# cgroup.
#SV_CG_SEND_SIGKILL="YES"

9
udevd-cg/down Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/execlineb -P
envfile /etc/s6/config/udevd.conf
importas -uD "udevd" SV_NAME
importas -uD "" SV_CG_SEND_SIGHUP
importas -uD "" SV_CG_TIMEOUT_STOPSEC
importas -uD "" SV_CG_SEND_SIGKILL
exec sh /usr/lib/artix/sv-cg.sh down $SV_NAME $SV_CG_SEND_SIGHUP $SV_CG_TIMEOUT_STOPSEC $SV_CG_SEND_SIGKILL

1
udevd-cg/type Normal file
View File

@@ -0,0 +1 @@
oneshot

7
udevd-cg/up Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/execlineb -P
envfile /etc/s6/config/udevd.conf
importas -uD "udevd" SV_NAME
importas -uD "" SV_CG_SETTINGS
exec sh /usr/lib/artix/sv-cg.sh up $SV_NAME $SV_CG_SETTINGS

View File

View File

@@ -1,2 +1,34 @@
# This configures the directives used for s6-log in the log service.
DIRECTIVES="n3 s6000000 T"
# This variable contains the cgroups version 2 settings for your services.
# If this is set in this file, the settings will apply to all services.
# If you want different settings for each service, place the settings in
# /etc/conf.d/foo for service foo.
# The format is to specify the setting and value followed by a newline.
# Multiple settings and values can be specified.
# For example, you would use this to set the maximum memory and maximum
# number of pids for a service.
#SV_CG_SETTINGS="
#memory.max 10485760
#pids.max max
#"
#
# For more information about the adjustments that can be made with
# cgroups version 2, see Documentation/cgroups-v2.txt in the linux kernel
# source tree.
#SV_CG_SETTINGS=""
# If this is yes, we will send sighup to the processes in the cgroup
# immediately after stopsig and sigcont.
#SV_CG_SEND_SIGHUP="NO"
# This is the amount of time in seconds that we delay after sending sigcont
# and optionally sighup, before we optionally send sigkill to all
# processes in the # cgroup.
# The default is 90 seconds.
#SV_CG_TIMEOUT_STOPSEC="90"
# If this is set to no, we do not send sigkill to all processes in the
# cgroup.
#SV_CG_SEND_SIGKILL="YES"