commit efb8952f699bf57c51fce9829eac3cf9c752375d
parent 4e63d25e5c0c872b4a7ac754e77878034f8680bc
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Mon, 5 May 2025 22:21:16 +0000
Generate seccomp policy BPF when creating container-bin-image
Diffstat:
19 files changed, 115 insertions(+), 36 deletions(-)
diff --git a/filelist.sha256 b/filelist.sha256
@@ -1,3 +1,4 @@
+f95933deaef52df8c8a5fda40144abf3bb9dca08f7b593832830385313f3817c files/.default-policy.easyseccomp.swp
9c102bcc376af1498d549b77bdbfa815ae86faa1d2d82f040e616b18ef2df2d4 files/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
ebf31683b56410ecc4c00acd9f6e2839e237a3b62b5ae7ef686705c7ba0396a9 files/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
1bb2a846c0ea4ca9d0e7862f970863857fc33c32f5506098c636a62a726a847b files/alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub
@@ -24,6 +25,7 @@ e81557d01115c246b88d9138281a6d16e484acb0581d396e6c03b02a378dcc1d files/busybox.
955edd28faae9dd665f002c85466eef58ef8fd36d76d1f39eb974e22933478ab files/busybox.config.1_12_0-8342-gaa4d303a3
9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2 files/busybox_bootstrap.config
75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3 files/config.sub
+5ac974317fbc4cd739ed1e1b2fa5c22f2e6af98606e04a3389efacef50e506a9 files/default-policy.easyseccomp
9be2e5a97b3fcbc60dedb71967667b9a21d562dbfdaa7f9f74f4b3d9cbb5df86 files/dwarf.h
1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd files/easyseccomp-configure.tar
eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10 files/easyseccomp_fix_includes.patch
diff --git a/files/default-policy.easyseccomp b/files/default-policy.easyseccomp
@@ -0,0 +1,62 @@
+$syscall in (
+@bind, @connect, @execve, @execveat, @fallocate, @fanotify_mark,
+@inotify_add_watch, @kill, @memfd_create, @socket, @statfs, @statfs64,
+@sysinfo, @uname, @breakpoint, @cachestat, @mseal, @rt_sigtimedwait_time64,
+@set_tls, @riscv_flush_icache, @cacheflush, @capset, @fanotify_init,
+@set_robust_list, @setdomainname, @sethostname, @setsockopt,
+@pidfd_send_signal, @fchown, @fchownat, @chown32, @lchown32, @chown, @fchown32,
+@lchown, @clone3, @clone, @utimensat_time64, @fchmodat2, @removexattrat,
+@setxattrat, @chmod, @fchmod, @fchmodat, @link, @linkat, @mkdir, @mkdirat,
+@creat, @open, @openat, @openat2, @fremovexattr, @lremovexattr, @removexattr,
+@rename, @renameat, @renameat2, @rmdir, @fsetxattr, @lsetxattr, @setxattr,
+@symlink, @symlinkat, @unlink, @unlinkat, @utime, @utimes, @utimensat, @fcntl,
+@fcntl64, @ioctl, @prctl, @socketcall, @setpriority, @ioprio_set,
+@sched_setattr, @sched_setparam, @sched_setscheduler, @brk, @mremap,
+@process_mrelease, @membarrier, @process_madvise, @mmap, @mmap2,
+@futex_requeue, @futex_time64, @futex_wait, @futex_waitv, @futex_wake,
+@sys_debug_swapcontext, @futex, @getxattrat, @listxattrat, @accept, @accept4,
+@access, @faccessat, @faccessat2, @chdir, @fchdir, @getdents64, @prlimit64,
+@setrlimit, @getsockname, @fgetxattr, @getxattr, @lgetxattr, @flistxattr,
+@listxattr, @llistxattr, @rt_sigqueueinfo, @rt_tgsigqueueinfo, @sendmsg,
+@sendto, @sendmmsg, @rt_sigaction, @sigaction, @fstat, @fstat64, @fstatat64,
+@lstat, @newfstatat, @stat, @stat64, @fstatfs, @fstatfs64, @statx, @tgkill,
+@ftruncate, @truncate, @rseq, @exit, @capget, @clock_getres, @clock_gettime,
+@clock_nanosleep, @close, @close_range, @copy_file_range, @dup, @dup2, @dup3,
+@epoll_create, @epoll_create1, @epoll_ctl, @epoll_pwait, @epoll_pwait2,
+@epoll_wait, @eventfd, @eventfd2, @exit_group, @flock, @fork, @fdatasync,
+@fsync, @get_robust_list, @getcpu, @getcwd, @getgroups, @getitimer, @setitimer,
+@getpagesize, @getpeername, @getpid, @getppid, @getpriority, @getrandom,
+@getresgid, @getresuid, @getrusage, @getsid, @getsockopt, @gettid,
+@gettimeofday, @inotify_init, @inotify_init1, @inotify_rm_watch, @ioprio_get,
+@listen, @lseek, @madvise, @mlock, @mlock2, @mlockall, @munlock, @munlockall,
+@munmap, @mprotect, @msync, @nanosleep, @pause, @pidfd_getfd, @pipe, @pipe2,
+@poll, @ppoll, @fadvise64, @pread64, @pwrite64, @read, @readahead, @readlink,
+@readlinkat, @preadv, @preadv2, @pwritev, @pwritev2, @readv, @writev,
+@recvfrom, @recvmsg, @recvmmsg, @restart_syscall, @sched_get_priority_max,
+@sched_get_priority_min, @sched_rr_get_interval, @sched_getaffinity,
+@sched_setaffinity, @sched_getattr, @sched_getparam, @sched_getscheduler,
+@sched_yield, @pselect6, @select, @sendfile, @set_tid_address, @getpgid,
+@getpgrp, @setpgid, @setsid, @shutdown, @sigaltstack, @signalfd, @signalfd4,
+@rt_sigpending, @rt_sigprocmask, @rt_sigsuspend, @rt_sigtimedwait, @socketpair,
+@splice, @arm_sync_file_range, @sync_file_range, @tee, @time, @timer_create,
+@timer_delete, @timer_getoverrun, @timer_gettime, @timer_settime,
+@timerfd_create, @timerfd_gettime, @timerfd_settime, @times, @umask, @vfork,
+@waitid, @wait4, @write, @getegid32, @getgid32, @getresgid32, @getresuid32,
+@geteuid32, @getuid32, @sigreturn, @lstat64, @sync_file_range2, @swapcontext,
+@ftruncate64, @truncate64, @atomic_barrier, @atomic_cmpxchg_32,
+@clock_getres_time64, @clock_gettime64, @clock_nanosleep_time64,
+@epoll_ctl_old, @epoll_wait_old, @ppoll_time64, @pselect6_time64,
+@recvmmsg_time64, @sched_rr_get_interval_time64, @timer_gettime64,
+@timer_settime64, @timerfd_gettime64, @timerfd_settime64, @alarm, @arch_prctl,
+@getgroups32, @getrlimit, @ugetrlimit, @_llseek, @arm_fadvise64_64,
+@fadvise64_64, @recv, @s390_pci_mmio_read, @s390_pci_mmio_write,
+@s390_runtime_instr, @_newselect, @send, @sendfile64, @get_thread_area,
+@set_thread_area, @signal, @sigpending, @sigsuspend, @waitpid, @getdents,
+@getegid, @getgid, @geteuid, @getuid, @shmctl, @shmget, @shmat, @shmdt,
+@setgroups32, @setfsgid32, @setfsuid32, @setgroups, @setfsgid, @setfsuid
+) => ALLOW();
+
+$syscall in KERNEL(5.3) => ERRNO(EPERM);
+
+=> ERRNO(ENOSYS);
+
diff --git a/templates/pkg/container-bin-image b/templates/pkg/container-bin-image
@@ -6,9 +6,13 @@
#+{{pkg_install_name("execline")}}
#+{{pkg_install_name("ccx-utils")}}
#+{{pkg_install_name("applyuidgid-caps")}}
+#+{{pkg_install_name("easyseccomp")}}
+#@sha256:{{files["default-policy.easyseccomp"]}}:default-policy.easyseccomp
-mkdir -p "$pthbs_destdir{{versions}}/$pthbs_package/container-bin-image"
-cd "$pthbs_destdir{{versions}}/$pthbs_package/container-bin-image"
+img="$pthbs_destdir{{versions}}/$pthbs_package/container-bin-image"
+mkdir -p "$img"
+easyseccomp -i default-policy.easyseccomp -o "$img/seccomp-default.bpf"
+cd "$img"
# first commands without argv0 aliases
for cmd in "${PATH%%:*}"/*; do
@@ -43,5 +47,6 @@ for cmd in if busybox umount chpst spawn-pty ptsname applyuidgid-caps; do
done
./true
+
touch "$pthbs_destdir{{versions}}/$pthbs_package/.install-links"
{% endblock %}
diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image
@@ -5,9 +5,13 @@
#+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+applyuidgid-caps.9856a13db04a0f0192c4208744de2c649db2ae721dc0d0dd37eb90346236a514
+#+easyseccomp.6631f58c9fe090f2b2becc5ac606901736aba4ad2a0075f6402bec85eaa3df7b
+#@sha256:5ac974317fbc4cd739ed1e1b2fa5c22f2e6af98606e04a3389efacef50e506a9:default-policy.easyseccomp
-mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package/container-bin-image"
-cd "$pthbs_destdir/home/ccx/versions/$pthbs_package/container-bin-image"
+img="$pthbs_destdir/home/ccx/versions/$pthbs_package/container-bin-image"
+mkdir -p "$img"
+easyseccomp -i default-policy.easyseccomp -o "$img/seccomp-default.bpf"
+cd "$img"
# first commands without argv0 aliases
for cmd in "${PATH%%:*}"/*; do
@@ -42,4 +46,5 @@ for cmd in if busybox umount chpst spawn-pty ptsname applyuidgid-caps; do
done
./true
+
touch "$pthbs_destdir/home/ccx/versions/$pthbs_package/.install-links"
diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers
@@ -6,7 +6,7 @@
#+alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4
#+apk-tools.69a8c172d8dc6f60957469c555cfa3627fef38bb076dde5f758fd64854ecb275
#+xbps.0c1ece8bbd380938c5c0744cf9d37f2a2f402dd2f16dfe9b9ec891a5c84b9646
-#+container-bin-image.89bd98f6272aeb7e6ed82d39fe88da6cff6c053965a304fbe00cc95ba7087501
+#+container-bin-image.c32049709cb5100a2562fa99c4f3f915596fa91a21b1d17f358206a67f2a64af
#@git:aa69a0fc1c82c14b945b9b7348306a4e82bb0bbc:containers
: ${JOBS:=1}
@@ -58,9 +58,9 @@ for f in '/home/ccx/versions/xbps.0c1ece8bbd380938c5c0744cf9d37f2a2f402dd2f16dfe
ln -sf "$f" "$pkgdir/deps/keys/void/"
done
-test -d '/home/ccx/versions/container-bin-image.89bd98f6272aeb7e6ed82d39fe88da6cff6c053965a304fbe00cc95ba7087501/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.89bd98f6272aeb7e6ed82d39fe88da6cff6c053965a304fbe00cc95ba7087501/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.89bd98f6272aeb7e6ed82d39fe88da6cff6c053965a304fbe00cc95ba7087501/container-bin-image' "$pkgdir/deps/"
+test -d '/home/ccx/versions/container-bin-image.c32049709cb5100a2562fa99c4f3f915596fa91a21b1d17f358206a67f2a64af/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.c32049709cb5100a2562fa99c4f3f915596fa91a21b1d17f358206a67f2a64af/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.c32049709cb5100a2562fa99c4f3f915596fa91a21b1d17f358206a67f2a64af/container-bin-image' "$pkgdir/deps/"
cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -7,7 +7,7 @@
#+s6-linux-utils.1990b55837ff2c28a81500d80292c6d530c8516347eb896007eb5aed2af6c425
#+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.2a3b7be55ff7e9d95d02765c01052d4833b5de65fc31121d50ab646885e05bfe
+#+containers.2ca7a377cd6c45ee29dafca510d2cdf0c139424c9c76e7eb28194a8913bd5e5a
#+xbps.0c1ece8bbd380938c5c0744cf9d37f2a2f402dd2f16dfe9b9ec891a5c84b9646
#+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c
#+apk-tools.69a8c172d8dc6f60957469c555cfa3627fef38bb076dde5f758fd64854ecb275
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.2a3b7be55ff7e9d95d02765c01052d4833b5de65fc31121d50ab646885e05bfe
+#+containers.2ca7a377cd6c45ee29dafca510d2cdf0c139424c9c76e7eb28194a8913bd5e5a
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
@@ -37,8 +37,8 @@
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
#+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
-#+system-config.0c31d0c96b3910225e031eadea7c8cda69a7c209b48533b2c9092c2153589622
-#+system-config-rc.1171d86c7647b3acaa2fab7ba8138100266f674df6c1e10e9e6e841aa9eb043c
+#+system-config.015262cd2bd98e244109b7dd5cddafda6321a4730c50d848ee11bc13239bca32
+#+system-config-rc.d0bcebace7b424bd7291ac636e5274643aa24f9aa6d8eafef6a5faead95c7e96
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.07ce8d86768bdaf43ffe116b81312dd6dfb34a3cc62600f620365712bf4bec4b
+#+system-config-init.2bac5d30c5bfe4411f02a7577f7eb718f77cef2f1e10b8600cde49f578c8858a
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
\ No newline at end of file
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -52,7 +52,7 @@ printf '%s\n' >config/etc/skel/loginexec \
chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
- 'pthbs_path_containers=/home/ccx/versions/env.135a253d6d807fcc111f7b079f52b230dc79d5e6fad3c0c9aa3e9725818bf186' \
+ 'pthbs_path_containers=/home/ccx/versions/env.f408b8fb68c81a8cf4003e9e0a49925862319db6a6a0fd38e96a975b4f2dfe43' \
'pthbs_path_mdevd=/home/ccx/versions/env.5049027ea8b6b4d373e16aadd3cdc63a940582ff297656e395f2131eef181671' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init
@@ -5,9 +5,9 @@
#+s6-portable-utils.1b8fd31be72bfe84afb28c3dfff03b1fc45121d11fc85f79c90f085fe61bc132
#+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2
#+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f
-#+system-config-rc.1171d86c7647b3acaa2fab7ba8138100266f674df6c1e10e9e6e841aa9eb043c
+#+system-config-rc.d0bcebace7b424bd7291ac636e5274643aa24f9aa6d8eafef6a5faead95c7e96
-s6rcdb=/home/ccx/versions/system-config-rc.1171d86c7647b3acaa2fab7ba8138100266f674df6c1e10e9e6e841aa9eb043c/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.d0bcebace7b424bd7291ac636e5274643aa24f9aa6d8eafef6a5faead95c7e96/config/s6-rc-db
prefix=/home/ccx/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc
@@ -3,7 +3,7 @@
#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc
#+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
-#+system-config.0c31d0c96b3910225e031eadea7c8cda69a7c209b48533b2c9092c2153589622
+#+system-config.015262cd2bd98e244109b7dd5cddafda6321a4730c50d848ee11bc13239bca32
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.0c31d0c96b3910225e031eadea7c8cda69a7c209b48533b2c9092c2153589622/config/s6-rc-source
+src=/home/ccx/versions/system-config.015262cd2bd98e244109b7dd5cddafda6321a4730c50d848ee11bc13239bca32/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.2a3b7be55ff7e9d95d02765c01052d4833b5de65fc31121d50ab646885e05bfe
+#+containers.2ca7a377cd6c45ee29dafca510d2cdf0c139424c9c76e7eb28194a8913bd5e5a
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image
@@ -5,9 +5,13 @@
#+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+applyuidgid-caps.2d571b717bda734b4464e7d3b36bb2c9eaa265fffd595bc090cbb137258121b8
+#+easyseccomp.a69f369af91163a534bf0d1bf51c74cd98c971d7eb5f61c2ee29afb6ba7a9344
+#@sha256:5ac974317fbc4cd739ed1e1b2fa5c22f2e6af98606e04a3389efacef50e506a9:default-policy.easyseccomp
-mkdir -p "$pthbs_destdir/versions/$pthbs_package/container-bin-image"
-cd "$pthbs_destdir/versions/$pthbs_package/container-bin-image"
+img="$pthbs_destdir/versions/$pthbs_package/container-bin-image"
+mkdir -p "$img"
+easyseccomp -i default-policy.easyseccomp -o "$img/seccomp-default.bpf"
+cd "$img"
# first commands without argv0 aliases
for cmd in "${PATH%%:*}"/*; do
@@ -42,4 +46,5 @@ for cmd in if busybox umount chpst spawn-pty ptsname applyuidgid-caps; do
done
./true
+
touch "$pthbs_destdir/versions/$pthbs_package/.install-links"
diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers
@@ -6,7 +6,7 @@
#+alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1
#+apk-tools.f56b624a4ea26318bf9117754fb5e0c564f7f466fedde43e1c45e86278dc2552
#+xbps.e82f8c85f25413cdfa1e23926d635ec0d5aa6059a953750d63de49eeacf3c672
-#+container-bin-image.079430bf4556198a982a83b2559cb822dc9215370b16cfd0f41efa283dae7f08
+#+container-bin-image.3c6645b005e639b725295f86e5bcc47106969cc82ae389f6756c3e87f42dc413
#@git:aa69a0fc1c82c14b945b9b7348306a4e82bb0bbc:containers
: ${JOBS:=1}
@@ -58,9 +58,9 @@ for f in '/versions/xbps.e82f8c85f25413cdfa1e23926d635ec0d5aa6059a953750d63de49e
ln -sf "$f" "$pkgdir/deps/keys/void/"
done
-test -d '/versions/container-bin-image.079430bf4556198a982a83b2559cb822dc9215370b16cfd0f41efa283dae7f08/container-bin-image'
-test -f '/versions/container-bin-image.079430bf4556198a982a83b2559cb822dc9215370b16cfd0f41efa283dae7f08/container-bin-image/if'
-ln -sf '/versions/container-bin-image.079430bf4556198a982a83b2559cb822dc9215370b16cfd0f41efa283dae7f08/container-bin-image' "$pkgdir/deps/"
+test -d '/versions/container-bin-image.3c6645b005e639b725295f86e5bcc47106969cc82ae389f6756c3e87f42dc413/container-bin-image'
+test -f '/versions/container-bin-image.3c6645b005e639b725295f86e5bcc47106969cc82ae389f6756c3e87f42dc413/container-bin-image/if'
+ln -sf '/versions/container-bin-image.3c6645b005e639b725295f86e5bcc47106969cc82ae389f6756c3e87f42dc413/container-bin-image' "$pkgdir/deps/"
cd "$pthbs_destdir/versions/$pthbs_package"
find -type d -o -print | awk -F/ '
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -7,7 +7,7 @@
#+s6-linux-utils.f7e0654375f11beedafd731ad1dd66c0de8d03452bb8e38bb647cc51cc3adb2e
#+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.071b171966b83ce676443431a57cdf93ec02408c396690453a3a2c664fd1b4ea
+#+containers.b50229c2569b7d2079776f9e6dcba90c1c2cd5ea020fb3440d745f442c176471
#+xbps.e82f8c85f25413cdfa1e23926d635ec0d5aa6059a953750d63de49eeacf3c672
#+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137
#+apk-tools.f56b624a4ea26318bf9117754fb5e0c564f7f466fedde43e1c45e86278dc2552
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.071b171966b83ce676443431a57cdf93ec02408c396690453a3a2c664fd1b4ea
+#+containers.b50229c2569b7d2079776f9e6dcba90c1c2cd5ea020fb3440d745f442c176471
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
@@ -37,8 +37,8 @@
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
#+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
-#+system-config.2596dd55e00c6211252f9d1816bbda094c69420ba94026061fbb708c36c1f79a
-#+system-config-rc.8f0ad074e454ebf29a9a72c188ebc23dacedcdb79e1bc1e5d6c8228d0f569c89
+#+system-config.cab98cddda71c8b64f5e0b73f9f66e45bcd830da9542e40d1005967ce51735de
+#+system-config-rc.0e3644723ac52a6c52ab7fe46e35fce9e526d1a97acfde28f2bad712cab15869
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.7415acad9fea6a3770c2cfc7dbf5f22d050fe473cc50a6d8e1264cc17068b67f
+#+system-config-init.bde557d02e6763bdd6f952953de285066ea30c5d862ccbb6f96cb5d9d764a31e
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
\ No newline at end of file
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -52,7 +52,7 @@ printf '%s\n' >config/etc/skel/loginexec \
chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
- 'pthbs_path_containers=/versions/env.1db730f1e58629eb10cfef050599a98715279562f534e804f6f0b6172aae7a21' \
+ 'pthbs_path_containers=/versions/env.43780aaca291024eb88914e29e3016229da9f3ce4abbfc69e698b33ef30b5385' \
'pthbs_path_mdevd=/versions/env.699c310193b7957c8ec17e16d6846443f99c198e3e2ce6425066f4523de2cf1e' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init
@@ -5,9 +5,9 @@
#+s6-portable-utils.f6171ad521d6be72875f1d5c1b28f966662ba93cfe5790e1ef010f9e76211bc3
#+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c
#+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9
-#+system-config-rc.8f0ad074e454ebf29a9a72c188ebc23dacedcdb79e1bc1e5d6c8228d0f569c89
+#+system-config-rc.0e3644723ac52a6c52ab7fe46e35fce9e526d1a97acfde28f2bad712cab15869
-s6rcdb=/versions/system-config-rc.8f0ad074e454ebf29a9a72c188ebc23dacedcdb79e1bc1e5d6c8228d0f569c89/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.0e3644723ac52a6c52ab7fe46e35fce9e526d1a97acfde28f2bad712cab15869/config/s6-rc-db
prefix=/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc
@@ -3,7 +3,7 @@
#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123
#+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
-#+system-config.2596dd55e00c6211252f9d1816bbda094c69420ba94026061fbb708c36c1f79a
+#+system-config.cab98cddda71c8b64f5e0b73f9f66e45bcd830da9542e40d1005967ce51735de
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.2596dd55e00c6211252f9d1816bbda094c69420ba94026061fbb708c36c1f79a/config/s6-rc-source
+src=/versions/system-config.cab98cddda71c8b64f5e0b73f9f66e45bcd830da9542e40d1005967ce51735de/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.071b171966b83ce676443431a57cdf93ec02408c396690453a3a2c664fd1b4ea
+#+containers.b50229c2569b7d2079776f9e6dcba90c1c2cd5ea020fb3440d745f442c176471
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
