Bump s6 services and prepare XDG stuff
This commit is contained in:
parent
108b2892fe
commit
207ac183a4
|
@ -1,7 +1,7 @@
|
||||||
# Contributor: Alex Denes <caskd@redxen.eu>
|
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||||
# Maintainer: Alex Denes <caskd@redxen.eu>
|
# Maintainer: Alex Denes <caskd@redxen.eu>
|
||||||
pkgname=nnd-s6-linux-init
|
pkgname=nnd-s6-linux-init
|
||||||
pkgver=1.6.1
|
pkgver=1.6.2
|
||||||
pkgrel=0
|
pkgrel=0
|
||||||
pkgdesc="Skeleton for nnd-s6-services and symlinks"
|
pkgdesc="Skeleton for nnd-s6-services and symlinks"
|
||||||
url="none"
|
url="none"
|
||||||
|
@ -22,6 +22,7 @@ prepare() {
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
s6-linux-init-maker -1 \
|
s6-linux-init-maker -1 \
|
||||||
|
-e PATH='/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin' \
|
||||||
-e HOME=/root \
|
-e HOME=/root \
|
||||||
-e XDG_RUNTIME_DIR=/run \
|
-e XDG_RUNTIME_DIR=/run \
|
||||||
-e XDG_CONFIG_HOME=/etc \
|
-e XDG_CONFIG_HOME=/etc \
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
. ../../APKBUILD.template
|
. ../../APKBUILD.template
|
||||||
|
|
||||||
pkgname=nnd-s6-services
|
pkgname=nnd-s6-services
|
||||||
pkgver=2.64
|
pkgver=2.66
|
||||||
pkgrel=2
|
pkgrel=0
|
||||||
pkgdesc="Base services for s6"
|
pkgdesc="Base services for s6"
|
||||||
depends="s6-rc s6-portable-utils s6-linux-utils"
|
depends="s6-rc s6-portable-utils s6-linux-utils"
|
||||||
builddir="$srcdir/"
|
builddir="$srcdir/"
|
||||||
|
@ -14,7 +14,6 @@ options=""
|
||||||
prepare() {
|
prepare() {
|
||||||
default_prepare
|
default_prepare
|
||||||
cp -R "$startdir"/rc "$builddir"/rc
|
cp -R "$startdir"/rc "$builddir"/rc
|
||||||
cp -R "$startdir"/env "$builddir"/env
|
|
||||||
cp -R "$startdir"/tmpl "$builddir"/tmpl
|
cp -R "$startdir"/tmpl "$builddir"/tmpl
|
||||||
cp "$startdir"/manage.sh "$builddir"/manage.sh
|
cp "$startdir"/manage.sh "$builddir"/manage.sh
|
||||||
}
|
}
|
||||||
|
@ -22,8 +21,8 @@ prepare() {
|
||||||
package() {
|
package() {
|
||||||
# Distributed bundles
|
# Distributed bundles
|
||||||
mkdir -p "$pkgdir/$_distpfx"
|
mkdir -p "$pkgdir/$_distpfx"
|
||||||
|
mkdir -p "$pkgdir/$_distpfx"/env
|
||||||
mv "$builddir"/rc "$pkgdir/$_distpfx"/rc
|
mv "$builddir"/rc "$pkgdir/$_distpfx"/rc
|
||||||
mv "$builddir"/env "$pkgdir/$_distpfx"/env
|
|
||||||
|
|
||||||
mkdir -p "$pkgdir/usr/libexec/nnd/"
|
mkdir -p "$pkgdir/usr/libexec/nnd/"
|
||||||
mv "$builddir"/tmpl "$pkgdir/usr/libexec/nnd"/s6
|
mv "$builddir"/tmpl "$pkgdir/usr/libexec/nnd"/s6
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
|
|
|
@ -1 +0,0 @@
|
||||||
/root
|
|
|
@ -1 +0,0 @@
|
||||||
/var/cache
|
|
|
@ -1 +0,0 @@
|
||||||
/etc
|
|
|
@ -1 +0,0 @@
|
||||||
/usr/share
|
|
|
@ -1 +0,0 @@
|
||||||
/run
|
|
|
@ -1 +0,0 @@
|
||||||
/var/lib
|
|
|
@ -13,6 +13,8 @@ alt_ab() {
|
||||||
|
|
||||||
: ${S6_PATH:="${XDG_DATA_HOME:="/etc"}/s6"}
|
: ${S6_PATH:="${XDG_DATA_HOME:="/etc"}/s6"}
|
||||||
: ${S6_DIST_PATH:="${XDG_CONFIG_HOME:="/usr/share"}/nnd/s6/dist"}
|
: ${S6_DIST_PATH:="${XDG_CONFIG_HOME:="/usr/share"}/nnd/s6/dist"}
|
||||||
|
: ${S6_LIVE_PATH:="${XDG_RUNTIME_DIR:="/run"}/s6-rc"}
|
||||||
|
: ${S6_SCANDIR_PATH:="${XDG_RUNTIME_DIR:="/run"}/service"}
|
||||||
: ${S6_RC_PATH:="$S6_PATH/rc"}
|
: ${S6_RC_PATH:="$S6_PATH/rc"}
|
||||||
: ${S6_ENV_PATH:="$S6_PATH/env"}
|
: ${S6_ENV_PATH:="$S6_PATH/env"}
|
||||||
: ${S6_SV_PATH:="$S6_PATH/sv"}
|
: ${S6_SV_PATH:="$S6_PATH/sv"}
|
||||||
|
@ -64,14 +66,15 @@ swap() {
|
||||||
}
|
}
|
||||||
|
|
||||||
update() {
|
update() {
|
||||||
if ! s6-rc-update "$S6_SV_PATH/current.$(DB_FRESH_ACT)"; then
|
if ! s6-rc-update -l "$S6_LIVE_PATH" "$S6_SV_PATH/current.$(DB_FRESH_ACT)"; then
|
||||||
error "Failed to update live state of the database"
|
error "Failed to update live state of the database"
|
||||||
return "$?"
|
return "$?"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
dist() {
|
dist() {
|
||||||
for src in "$S6_DIST_PATH/rc"/* "$S6_DIST_PATH/env"/*; do
|
#for src in "$S6_DIST_PATH/rc"/* "$S6_DIST_PATH/env"/*; do
|
||||||
|
for src in "$S6_DIST_PATH/rc"/*; do
|
||||||
local svc="${src#$S6_DIST_PATH/}"
|
local svc="${src#$S6_DIST_PATH/}"
|
||||||
if [ ! -e "$S6_PATH/$svc" ]; then
|
if [ ! -e "$S6_PATH/$svc" ]; then
|
||||||
default "$svc" || return "$?"
|
default "$svc" || return "$?"
|
||||||
|
@ -157,6 +160,21 @@ removedangle() {
|
||||||
find -L "$dir" -maxdepth 1 -type l -exec rm -v -- {} +
|
find -L "$dir" -maxdepth 1 -type l -exec rm -v -- {} +
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# TODO
|
||||||
|
# makeusertree() {
|
||||||
|
# USR="$1"
|
||||||
|
# UID="$(id -u "$USR")"
|
||||||
|
# RUNTIME_DIR="/run/user/$UID"
|
||||||
|
# : ${PARENT_RCDIR:+"/etc/s6/rc"}
|
||||||
|
# s6-usertree-maker \
|
||||||
|
# -d "$RUNTIME_DIR"/service \
|
||||||
|
# -r usertree."$UID"/logger.usertree."$UID" \
|
||||||
|
# -l "$USR" \
|
||||||
|
# "$USR" \
|
||||||
|
# "$RUNTIME_DIR"/uncaught-logs/ \
|
||||||
|
# "$PARENT_RCDIR"
|
||||||
|
# }
|
||||||
|
|
||||||
cmd="$1"
|
cmd="$1"
|
||||||
shift
|
shift
|
||||||
if [ -z "$cmd" ]; then
|
if [ -z "$cmd" ]; then
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -I /etc/s6/env/bird
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
importas -D /etc/bird/bird.conf CONFIG CONFIG
|
|
||||||
|
|
||||||
s6-envdir -i /etc/s6/env/path
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/bird
|
||||||
emptyenv -p
|
importas -D ${XDG_CONFIG_HOME}/bird/bird.conf CONFIG CONFIG
|
||||||
|
|
||||||
fdmove -c 2 1
|
fdmove -c 2 1
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
bundle
|
|
@ -0,0 +1 @@
|
||||||
|
bundle
|
|
@ -0,0 +1 @@
|
||||||
|
bundle
|
|
@ -1,7 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
fdmove -c 2 1
|
fdmove -c 2 1
|
||||||
|
|
||||||
ceph-exporter
|
ceph-exporter
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
importas -i XDG_STATE_HOME XDG_STATE_HOME
|
||||||
define ID 0
|
define ID 0
|
||||||
|
|
||||||
s6-envdir -i /etc/s6/env/ceph.osd.${ID}
|
s6-envdir -i ${XDG_CONFIG_HOME}/s6/env/ceph.osd.${ID}
|
||||||
importas -i DEV DEV
|
importas -i DEV DEV
|
||||||
emptyenv
|
|
||||||
|
|
||||||
export SRC /var/lib/ceph/osd/ceph-${ID}/block
|
export SRC ${XDG_STATE_HOME}/ceph/osd/ceph-${ID}/block
|
||||||
export DEST $DEV
|
export DEST $DEV
|
||||||
|
|
||||||
/usr/libexec/nnd/s6/symlink
|
/usr/libexec/nnd/s6/symlink
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
define ID 0
|
define ID 0
|
||||||
|
|
||||||
s6-envdir -i /etc/s6/env/ceph.osd.${ID}
|
s6-envdir -i ${XDG_CONFIG_HOME}/s6/env/ceph.osd.${ID}
|
||||||
importas -i DEV DEV
|
importas -i DEV DEV
|
||||||
|
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
ceph-bluestore-tool prime-osd-dir --dev $DEV --path /var/lib/ceph/osd/ceph-${ID} --no-mon-config
|
ceph-bluestore-tool prime-osd-dir --dev $DEV --path /var/lib/ceph/osd/ceph-${ID} --no-mon-config
|
||||||
|
|
|
@ -1,5 +1,2 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
hwclock -u --systz
|
hwclock -u --systz
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
fdmove -c 2 1
|
fdmove -c 2 1
|
||||||
|
|
||||||
dbus-daemon --system --nopidfile --nosyslog --nofork
|
dbus-daemon --system --nopidfile --nosyslog --nofork
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
logger.dmeventd
|
|
@ -1,5 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
fdmove -c 2 1
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
dmeventd -d -f
|
dmeventd -ddd -l
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -I /etc/s6/env/gortr
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
importas -D https://dn42.burble.com/roa/dn42_roa_46.json ENDPOINT ENDPOINT
|
|
||||||
|
|
||||||
s6-envdir -i /etc/s6/env/path
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/gortr
|
||||||
emptyenv -p
|
importas -D https://dn42.burble.com/roa/dn42_roa_46.json ENDPOINT ENDPOINT
|
||||||
|
|
||||||
fdmove -c 2 1
|
fdmove -c 2 1
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,6 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
define GROUP seat
|
define GROUP seat
|
||||||
|
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
ifelse -n {
|
ifelse -n {
|
||||||
# Silence output
|
# Silence output
|
||||||
redirfd -w 1 /dev/null
|
redirfd -w 1 /dev/null
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
define INTERFACE br0
|
define INTERFACE br0
|
||||||
define PROP mcast_mld_version
|
define PROP mcast_mld_version
|
||||||
define STATE 2
|
define STATE 2
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
define INTERFACE br0
|
define INTERFACE br0
|
||||||
define PROP mcast_querier
|
define PROP mcast_querier
|
||||||
define STATE 0
|
define STATE 0
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
define INTERFACE br0
|
define INTERFACE br0
|
||||||
define PROP mcast_querier
|
define PROP mcast_querier
|
||||||
define STATE 1
|
define STATE 1
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
define INTERFACE br0
|
define INTERFACE br0
|
||||||
define PROP mcast_router
|
define PROP mcast_router
|
||||||
define STATE 0
|
define STATE 0
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
define INTERFACE br0
|
define INTERFACE br0
|
||||||
define PROP mcast_router
|
define PROP mcast_router
|
||||||
define STATE 1
|
define STATE 1
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
define INTERFACE br0
|
define INTERFACE br0
|
||||||
define PROP mcast_snooping
|
define PROP mcast_snooping
|
||||||
define STATE 0
|
define STATE 0
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
define INTERFACE br0
|
define INTERFACE br0
|
||||||
ip link del $INTERFACE
|
ip link del $INTERFACE
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
define INTERFACE br0
|
define INTERFACE br0
|
||||||
ip link add $INTERFACE type bridge
|
ip link add $INTERFACE type bridge
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
define INTERFACE br0
|
define INTERFACE br0
|
||||||
fdmove -c 2 1
|
fdmove -c 2 1
|
||||||
udhcpc -i $INTERFACE -f -S
|
udhcpc -i $INTERFACE -f -S
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
define INTERFACE br0
|
define INTERFACE br0
|
||||||
ip link set dev $INTERFACE down
|
ip link set dev $INTERFACE down
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
define INTERFACE br0
|
define INTERFACE br0
|
||||||
ip link set dev $INTERFACE up
|
ip link set dev $INTERFACE up
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
define SLAVEIF eth0
|
define SLAVEIF eth0
|
||||||
ip link set dev $SLAVEIF nomaster
|
ip link set dev $SLAVEIF nomaster
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
define MASTERIF br0
|
define MASTERIF br0
|
||||||
define SLAVEIF eth0
|
define SLAVEIF eth0
|
||||||
ip link set dev $SLAVEIF master $MASTERIF
|
ip link set dev $SLAVEIF master $MASTERIF
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
define INTERFACE eth0
|
define INTERFACE eth0
|
||||||
bcnm-waitif 1 $INTERFACE
|
bcnm-waitif 1 $INTERFACE
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
define INTERFACE eth0
|
define INTERFACE eth0
|
||||||
ip link set dev $INTERFACE down
|
ip link set dev $INTERFACE down
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
define INTERFACE eth0
|
define INTERFACE eth0
|
||||||
ip link set dev $INTERFACE up
|
ip link set dev $INTERFACE up
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
oneshot
|
|
@ -0,0 +1,3 @@
|
||||||
|
#!/bin/execlineb -P
|
||||||
|
define INTERFACE lo
|
||||||
|
bcnm-waitif 1 $INTERFACE
|
|
@ -1,7 +1,3 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
define INTERFACE lo
|
define INTERFACE lo
|
||||||
|
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
ip link set dev $INTERFACE down
|
ip link set dev $INTERFACE down
|
||||||
|
|
|
@ -1,7 +1,3 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
define INTERFACE lo
|
define INTERFACE lo
|
||||||
|
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
ip link set dev $INTERFACE up
|
ip link set dev $INTERFACE up
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -I /etc/s6/env/irqbalance
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
importas -D 10 INTERVAL INTERVAL
|
|
||||||
|
|
||||||
s6-envdir -i /etc/s6/env/path
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/irqbalance
|
||||||
emptyenv -p
|
importas -D 10 INTERVAL INTERVAL
|
||||||
|
|
||||||
fdmove -c 2 1
|
fdmove -c 2 1
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
define READFROM /proc/kmsg
|
define READFROM /proc/kmsg
|
||||||
|
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
redirfd -r 0 $READFROM ucspilogd
|
redirfd -r 0 $READFROM ucspilogd
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
if -t {
|
if -t {
|
||||||
pipeline {
|
pipeline {
|
||||||
pipeline {
|
pipeline {
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
pipeline { virsh list --name --all --state-running --state-paused --state-other }
|
pipeline { virsh list --name --all --state-running --state-paused --state-other }
|
||||||
forstdin -E -C -p DOMAIN virsh destroy $DOMAIN
|
forstdin -E -C -p DOMAIN virsh destroy $DOMAIN
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
fdmove -c 2 1
|
fdmove -c 2 1
|
||||||
|
|
||||||
lldpd -d
|
lldpd -d
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
dmeventd
|
|
@ -0,0 +1 @@
|
||||||
|
3
|
|
@ -0,0 +1,4 @@
|
||||||
|
#!/bin/execlineb -P
|
||||||
|
export NAME dmeventd
|
||||||
|
|
||||||
|
/usr/libexec/nnd/s6/logger
|
|
@ -0,0 +1 @@
|
||||||
|
longrun
|
|
@ -0,0 +1,3 @@
|
||||||
|
pipewire
|
||||||
|
wireplumber
|
||||||
|
pipewire-pulse
|
|
@ -0,0 +1 @@
|
||||||
|
3
|
|
@ -0,0 +1,4 @@
|
||||||
|
#!/bin/execlineb -P
|
||||||
|
export NAME pipewire
|
||||||
|
|
||||||
|
/usr/libexec/nnd/s6/logger
|
|
@ -0,0 +1 @@
|
||||||
|
longrun
|
|
@ -1,8 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
# Log everything to stdout
|
|
||||||
fdmove -c 2 1
|
fdmove -c 2 1
|
||||||
|
|
||||||
lxd -v
|
lxd -v
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
ifelse -Xn { [ -r /etc/machine-id ] } {
|
ifelse -Xn { [ -r /etc/machine-id ] } {
|
||||||
redirfd -w 1 /etc/machine-id
|
redirfd -w 1 /etc/machine-id
|
||||||
foreground {
|
foreground {
|
||||||
|
|
|
@ -1,5 +1,2 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
mdevd-coldplug
|
mdevd-coldplug
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
define NOTIFYFD 3
|
define NOTIFYFD 3
|
||||||
|
|
||||||
s6-envdir -I /etc/s6/env/mdevd
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mdevd
|
||||||
importas -D 500000 KBUFSZ KBUFSZ
|
importas -D 500000 KBUFSZ KBUFSZ
|
||||||
|
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
mdevd -D $NOTIFYFD -b $KBUFSZ
|
mdevd -D $NOTIFYFD -b $KBUFSZ
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export SRC LABEL=nnd-efi
|
export SRC LABEL=nnd-efi
|
||||||
export OPTS rw
|
export OPTS rw
|
||||||
export FSTYPE vfat
|
export FSTYPE vfat
|
||||||
s6-envdir -I /etc/s6/env/mount.boot-efi
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.boot-efi
|
||||||
|
|
||||||
export DEST /boot/efi
|
export DEST /boot/efi
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export SRC LABEL=nnd-boot
|
export SRC LABEL=nnd-boot
|
||||||
export OPTS rw
|
export OPTS rw
|
||||||
export FSTYPE ext4
|
export FSTYPE ext4
|
||||||
s6-envdir -I /etc/s6/env/mount.boot
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.boot
|
||||||
|
|
||||||
export DEST /boot
|
export DEST /boot
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export OPTS pagesize=2M
|
export OPTS pagesize=2M
|
||||||
export FSTYPE hugetlbfs
|
export FSTYPE hugetlbfs
|
||||||
s6-envdir -I /etc/s6/env/mount.dev-hugepages
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.dev-hugepages
|
||||||
|
|
||||||
export DEST /dev/hugepages
|
export DEST /dev/hugepages
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export OPTS nosuid,noexec,nodev
|
export OPTS nosuid,noexec,nodev
|
||||||
export FSTYPE mqueue
|
export FSTYPE mqueue
|
||||||
s6-envdir -I /etc/s6/env/mount.dev-mqueue
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.dev-mqueue
|
||||||
|
|
||||||
export DEST /dev/mqueue
|
export DEST /dev/mqueue
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export OPTS nosuid,noexec,mode=620,ptmxmode=000
|
export OPTS nosuid,noexec,mode=620,ptmxmode=000
|
||||||
export FSTYPE devpts
|
export FSTYPE devpts
|
||||||
s6-envdir -I /etc/s6/env/mount.dev-pts
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.dev-pts
|
||||||
|
|
||||||
export DEST /dev/pts
|
export DEST /dev/pts
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export OPTS nosuid,noexec,nodev,inode64
|
export OPTS nosuid,noexec,nodev,inode64
|
||||||
export FSTYPE tmpfs
|
export FSTYPE tmpfs
|
||||||
s6-envdir -I /etc/s6/env/mount.dev-shm
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.dev-shm
|
||||||
|
|
||||||
export DEST /dev/shm
|
export DEST /dev/shm
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export OPTS nosuid,noexec,mode=755,inode64
|
export OPTS nosuid,noexec,mode=755,inode64
|
||||||
export FSTYPE devtmpfs
|
export FSTYPE devtmpfs
|
||||||
s6-envdir -I /etc/s6/env/mount.dev
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.dev
|
||||||
|
|
||||||
export DEST /dev
|
export DEST /dev
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export OPTS rw,nosuid,nodev,noexec,relatime
|
export OPTS rw,nosuid,nodev,noexec,relatime
|
||||||
export FSTYPE binfmt_misc
|
export FSTYPE binfmt_misc
|
||||||
s6-envdir -I /etc/s6/env/mount.proc-sys-fs-binfmt_misc
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.proc-sys-fs-binfmt_misc
|
||||||
|
|
||||||
export DEST /proc/sys/fs/binfmt_misc
|
export DEST /proc/sys/fs/binfmt_misc
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export OPTS nosuid,nodev,noexec,hidepid=2
|
export OPTS nosuid,nodev,noexec,hidepid=2
|
||||||
export FSTYPE proc
|
export FSTYPE proc
|
||||||
s6-envdir -I /etc/s6/env/mount.proc
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.proc
|
||||||
|
|
||||||
export DEST /proc
|
export DEST /proc
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export SRC LABEL=nnd-root
|
export SRC LABEL=nnd-root
|
||||||
export OPTS rw
|
export OPTS rw
|
||||||
export FSTYPE btrfs
|
export FSTYPE btrfs
|
||||||
s6-envdir -I /etc/s6/env/mount.root
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.root
|
||||||
|
|
||||||
export DEST /
|
export DEST /
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export OPTS nodev,nosuid,mode=755,inode64
|
export OPTS nodev,nosuid,mode=755,inode64
|
||||||
export FSTYPE tmpfs
|
export FSTYPE tmpfs
|
||||||
s6-envdir -I /etc/s6/env/mount.run
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.run
|
||||||
|
|
||||||
export DEST /run
|
export DEST /run
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export OPTS nosuid,nodev,noexec
|
export OPTS nosuid,nodev,noexec
|
||||||
export FSTYPE efivarfs
|
export FSTYPE efivarfs
|
||||||
s6-envdir -I /etc/s6/env/mount.sys-firmware-efi-efivars
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.sys-firmware-efi-efivars
|
||||||
|
|
||||||
export DEST /sys/firmware/efi/efivars
|
export DEST /sys/firmware/efi/efivars
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export OPTS rw,nosuid,nodev,noexec,relatime,nsdelegate
|
export OPTS rw,nosuid,nodev,noexec,relatime,nsdelegate
|
||||||
export FSTYPE cgroup2
|
export FSTYPE cgroup2
|
||||||
s6-envdir -I /etc/s6/env/mount.sys-fs-cgroup
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.sys-fs-cgroup
|
||||||
|
|
||||||
export DEST /sys/fs/cgroup
|
export DEST /sys/fs/cgroup
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export OPTS nosuid,nodev,noexec
|
export OPTS nosuid,nodev,noexec
|
||||||
export FSTYPE pstore
|
export FSTYPE pstore
|
||||||
s6-envdir -I /etc/s6/env/mount.sys-fs-pstore
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.sys-fs-pstore
|
||||||
|
|
||||||
export DEST /sys/fs/pstore
|
export DEST /sys/fs/pstore
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export OPTS nosuid,nodev,noexec
|
export OPTS nosuid,nodev,noexec
|
||||||
export FSTYPE securityfs
|
export FSTYPE securityfs
|
||||||
s6-envdir -I /etc/s6/env/mount.sys-kernel-security
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.sys-kernel-security
|
||||||
|
|
||||||
export DEST /sys/kernel/security
|
export DEST /sys/kernel/security
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export OPTS nosuid,nodev,noexec
|
export OPTS nosuid,nodev,noexec
|
||||||
export FSTYPE sysfs
|
export FSTYPE sysfs
|
||||||
s6-envdir -I /etc/s6/env/mount.sys
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.sys
|
||||||
|
|
||||||
export DEST /sys
|
export DEST /sys
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export OPTS nodev,nosuid
|
export OPTS nodev,nosuid
|
||||||
export FSTYPE tmpfs
|
export FSTYPE tmpfs
|
||||||
s6-envdir -I /etc/s6/env/mount.tmp
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.tmp
|
||||||
|
|
||||||
export DEST /tmp
|
export DEST /tmp
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
|
|
||||||
export FSTYPE tmpfs
|
export FSTYPE tmpfs
|
||||||
s6-envdir -I /etc/s6/env/mount.var-lib-ceph-osd-ceph-0
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.var-lib-ceph-osd-ceph-0
|
||||||
|
|
||||||
export DEST /var/lib/ceph/osd/ceph-0
|
export DEST /var/lib/ceph/osd/ceph-0
|
||||||
/usr/libexec/nnd/s6/mount
|
/usr/libexec/nnd/s6/mount
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
fdmove -c 2 1
|
fdmove -c 2 1
|
||||||
|
|
||||||
multipathd -d -v 3
|
multipathd -d -v 3
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -I /etc/s6/env/nameif
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
importas -D /etc/mactab CONFIG CONFIG
|
|
||||||
|
|
||||||
s6-envdir -i /etc/s6/env/path
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/nameif
|
||||||
emptyenv -p
|
importas -D ${XDG_CONFIG_HOME}/mactab CONFIG CONFIG
|
||||||
|
|
||||||
nameif -c $CONFIG
|
nameif -c $CONFIG
|
||||||
|
|
|
@ -1,5 +1,2 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -i /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
nft flush ruleset
|
nft flush ruleset
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -I /etc/s6/env/nftables
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
importas -D /etc/nnd/nftables/loadall RULESET RULESET
|
|
||||||
importas -D /etc/nnd/nftables/ RULEDIR RULEDIR
|
|
||||||
|
|
||||||
s6-envdir -i /etc/s6/env/path
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/nftables
|
||||||
emptyenv -p
|
importas -D ${XDG_CONFIG_HOME}/nnd/nftables/loadall RULESET RULESET
|
||||||
|
importas -D ${XDG_CONFIG_HOME}/nnd/nftables/ RULEDIR RULEDIR
|
||||||
|
|
||||||
nft -I $RULEDIR -f $RULESET
|
nft -I $RULEDIR -f $RULESET
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -I /etc/s6/env/ntpd.1
|
importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
|
||||||
importas -D 2.pool.ntp.org NTPS NTPS
|
|
||||||
|
|
||||||
s6-envdir -i /etc/s6/env/path
|
s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/ntpd.1
|
||||||
emptyenv -p
|
importas -D 2.pool.ntp.org NTPS NTPS
|
||||||
|
|
||||||
fdmove -c 2 1
|
fdmove -c 2 1
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,2 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
s6-envdir -I /etc/s6/env/path
|
|
||||||
emptyenv -p
|
|
||||||
|
|
||||||
partprobe
|
partprobe
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
logger.pipewire
|
|
@ -0,0 +1,4 @@
|
||||||
|
#!/bin/execlineb -P
|
||||||
|
fdmove -c 2 1
|
||||||
|
|
||||||
|
pipewire-pulse
|
|
@ -0,0 +1 @@
|
||||||
|
longrun
|
|
@ -0,0 +1 @@
|
||||||
|
logger.pipewire
|
|
@ -0,0 +1,4 @@
|
||||||
|
#!/bin/execlineb -P
|
||||||
|
fdmove -c 2 1
|
||||||
|
|
||||||
|
pipewire
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue