mrrl

Minimal Reliable Reproducible Linux
git clone https://ccx.te2000.cz/git/mrrl
Log | Files | Refs | Submodules | README

commit 41f4b74d0d811007e17e04af46a672a5a73c10b4
parent 905f221663395471480ba699df66894475f17dd4
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue,  6 May 2025 12:09:01 +0000

Fix easyseccomp policy.

Diffstat:
Mfilelist.sha256 | 4++--
Mfiles/default-policy.easyseccomp | 6+++---
Mvariants/ccx-x86_64/container-bin-image | 2+-
Mvariants/ccx-x86_64/containers | 8++++----
Mvariants/ccx-x86_64/containers.environment | 2+-
Mvariants/ccx-x86_64/default.environment | 8++++----
Mvariants/ccx-x86_64/system-config | 2+-
Mvariants/ccx-x86_64/system-config-init | 4++--
Mvariants/ccx-x86_64/system-config-rc | 4++--
Mvariants/ccx-x86_64/userspace.environment | 2+-
Mvariants/root-x86_64/container-bin-image | 2+-
Mvariants/root-x86_64/containers | 8++++----
Mvariants/root-x86_64/containers.environment | 2+-
Mvariants/root-x86_64/default.environment | 8++++----
Mvariants/root-x86_64/system-config | 2+-
Mvariants/root-x86_64/system-config-init | 4++--
Mvariants/root-x86_64/system-config-rc | 4++--
Mvariants/root-x86_64/userspace.environment | 2+-
18 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/filelist.sha256 b/filelist.sha256 @@ -1,4 +1,4 @@ -290a776a580be57238f599b57cab804c9305b97e4169aaf979c21d9e072bb03a files/.default-policy.easyseccomp.swp +8cb5ffe4cf720c08fae551a70170334a0f58c49562945fb2f86e5d8bb6a345d5 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 @@ -25,7 +25,7 @@ e81557d01115c246b88d9138281a6d16e484acb0581d396e6c03b02a378dcc1d files/busybox. 955edd28faae9dd665f002c85466eef58ef8fd36d76d1f39eb974e22933478ab files/busybox.config.1_12_0-8342-gaa4d303a3 9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2 files/busybox_bootstrap.config 75d5d255a2a273b6e651f82eecfabf6cbcd8eaeae70e86b417384c8f4a58d8d3 files/config.sub -8a2e661492d1100d10414a99a5b930feab18082193310927933809ebf1cdb89d files/default-policy.easyseccomp +f2efbb9b889a3cae31e319b5ab36dfb0185cea5dba4f6ef05e3d5d21600f1da2 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 @@ -78,9 +78,6 @@ $syscall in ( ) => ALLOW(); #endif -$syscall in KERNEL(5.3) => ERRNO(EPERM); -=> ERRNO(ENOSYS); - #ifdef ALLOW_SECCOMP $syscall == @seccomp => ALLOW(); #endif @@ -92,3 +89,6 @@ $syscall in ( @landlock_restrict_self, ) => ALLOW(); #endif + +$syscall in KERNEL(5.3) => ERRNO(EPERM); +=> ERRNO(ENOSYS); diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -6,7 +6,7 @@ #+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114 #+applyuidgid-caps.9856a13db04a0f0192c4208744de2c649db2ae721dc0d0dd37eb90346236a514 #+easyseccomp.6631f58c9fe090f2b2becc5ac606901736aba4ad2a0075f6402bec85eaa3df7b -#@sha256:8a2e661492d1100d10414a99a5b930feab18082193310927933809ebf1cdb89d:default-policy.easyseccomp +#@sha256:f2efbb9b889a3cae31e319b5ab36dfb0185cea5dba4f6ef05e3d5d21600f1da2:default-policy.easyseccomp img="$pthbs_destdir/home/ccx/versions/$pthbs_package/container-bin-image" mkdir -p "$img" 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.2b4493f2372f8c96e0082ac9abdc8e2f1c9c7150ef6a6fd4ec56146a27ff0538 +#+container-bin-image.04eca544da49756261163971548b203a1e171989bd0b1e141c136c0d60930260 #@git:066a430ec537775a1df9b30805dce551d78258c0: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.2b4493f2372f8c96e0082ac9abdc8e2f1c9c7150ef6a6fd4ec56146a27ff0538/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.2b4493f2372f8c96e0082ac9abdc8e2f1c9c7150ef6a6fd4ec56146a27ff0538/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.2b4493f2372f8c96e0082ac9abdc8e2f1c9c7150ef6a6fd4ec56146a27ff0538/container-bin-image' "$pkgdir/deps/" +test -d '/home/ccx/versions/container-bin-image.04eca544da49756261163971548b203a1e171989bd0b1e141c136c0d60930260/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.04eca544da49756261163971548b203a1e171989bd0b1e141c136c0d60930260/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.04eca544da49756261163971548b203a1e171989bd0b1e141c136c0d60930260/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.294d8f6bdb259957a7690bfac0af2ec7d19218848286bf3bbc88ad276b356cec +#+containers.652fb6267f748cb64124d45b753750aab41162f37fb631832ce96230392659ac #+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.294d8f6bdb259957a7690bfac0af2ec7d19218848286bf3bbc88ad276b356cec +#+containers.652fb6267f748cb64124d45b753750aab41162f37fb631832ce96230392659ac #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 #+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 @@ -37,8 +37,8 @@ #+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114 #+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8 #+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103 -#+system-config.eba2b26495741d474572ee44c6dfce73b6c906612b115b0310604dfcf5bc796e -#+system-config-rc.05867f4260a1f1a02bade77965cd12052e856428ffbf3b04bf7c83f95fc28bbb +#+system-config.a71a5c75ca8888805a028ab70e75a2a04ec324351de6bdec64cd5124aa1dbaa9 +#+system-config-rc.01ca0607713ce211f8849b84621deaf6cbe7a101e11d65931199e1a512eb5491 #+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d -#+system-config-init.0a100a43105920a28d908c00fcdf512a19df08b36663f62800043639bb4865dd +#+system-config-init.72180c923200e66f17f67783c74d87a2f7f89c65d08268536b2fed3325415b3d #+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.e606480c4b55f2cf58d1161b66ab9dbb7085eaa75bace54862800c5c12a37308' \ + 'pthbs_path_containers=/home/ccx/versions/env.954ee4bea97b6897eb37caf5f862025b888bb32b6730e8c06a44176bcacee330' \ '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.05867f4260a1f1a02bade77965cd12052e856428ffbf3b04bf7c83f95fc28bbb +#+system-config-rc.01ca0607713ce211f8849b84621deaf6cbe7a101e11d65931199e1a512eb5491 -s6rcdb=/home/ccx/versions/system-config-rc.05867f4260a1f1a02bade77965cd12052e856428ffbf3b04bf7c83f95fc28bbb/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.01ca0607713ce211f8849b84621deaf6cbe7a101e11d65931199e1a512eb5491/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.eba2b26495741d474572ee44c6dfce73b6c906612b115b0310604dfcf5bc796e +#+system-config.a71a5c75ca8888805a028ab70e75a2a04ec324351de6bdec64cd5124aa1dbaa9 def_prefix() { prefix=/home/ccx/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/home/ccx/versions/system-config.eba2b26495741d474572ee44c6dfce73b6c906612b115b0310604dfcf5bc796e/config/s6-rc-source +src=/home/ccx/versions/system-config.a71a5c75ca8888805a028ab70e75a2a04ec324351de6bdec64cd5124aa1dbaa9/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.294d8f6bdb259957a7690bfac0af2ec7d19218848286bf3bbc88ad276b356cec +#+containers.652fb6267f748cb64124d45b753750aab41162f37fb631832ce96230392659ac #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 #+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -6,7 +6,7 @@ #+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac #+applyuidgid-caps.2d571b717bda734b4464e7d3b36bb2c9eaa265fffd595bc090cbb137258121b8 #+easyseccomp.a69f369af91163a534bf0d1bf51c74cd98c971d7eb5f61c2ee29afb6ba7a9344 -#@sha256:8a2e661492d1100d10414a99a5b930feab18082193310927933809ebf1cdb89d:default-policy.easyseccomp +#@sha256:f2efbb9b889a3cae31e319b5ab36dfb0185cea5dba4f6ef05e3d5d21600f1da2:default-policy.easyseccomp img="$pthbs_destdir/versions/$pthbs_package/container-bin-image" mkdir -p "$img" 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.0090f29a950bc5f19ae6b975292940848fe8e27a5b5e394d0e89d2ad704e4f6b +#+container-bin-image.b4cb632dc8087659a92c88ab6620f2e637eb7d6c9fb582a0d70dbcf4bb932ed3 #@git:066a430ec537775a1df9b30805dce551d78258c0: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.0090f29a950bc5f19ae6b975292940848fe8e27a5b5e394d0e89d2ad704e4f6b/container-bin-image' -test -f '/versions/container-bin-image.0090f29a950bc5f19ae6b975292940848fe8e27a5b5e394d0e89d2ad704e4f6b/container-bin-image/if' -ln -sf '/versions/container-bin-image.0090f29a950bc5f19ae6b975292940848fe8e27a5b5e394d0e89d2ad704e4f6b/container-bin-image' "$pkgdir/deps/" +test -d '/versions/container-bin-image.b4cb632dc8087659a92c88ab6620f2e637eb7d6c9fb582a0d70dbcf4bb932ed3/container-bin-image' +test -f '/versions/container-bin-image.b4cb632dc8087659a92c88ab6620f2e637eb7d6c9fb582a0d70dbcf4bb932ed3/container-bin-image/if' +ln -sf '/versions/container-bin-image.b4cb632dc8087659a92c88ab6620f2e637eb7d6c9fb582a0d70dbcf4bb932ed3/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.7ba1b40c117de79f020ab32f3f11a33b3d447ed5d2a54d8b5c5c1ad8e79bdd71 +#+containers.f93855f1ba4f2038eac25745f68b39aa17414ba814a67695790e94c95d976397 #+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.7ba1b40c117de79f020ab32f3f11a33b3d447ed5d2a54d8b5c5c1ad8e79bdd71 +#+containers.f93855f1ba4f2038eac25745f68b39aa17414ba814a67695790e94c95d976397 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5 @@ -37,8 +37,8 @@ #+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac #+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca #+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296 -#+system-config.04ee3598969545f7489352578b219823e819f6e71026bff2aa18841cf6bbc789 -#+system-config-rc.4973c3015e4dcf7ec9a14cb1a22d0b649703c3c87e1e3428aad1485e3b6c3fff +#+system-config.efbf08f74e133cff7426bb4af26e72d0649619f303bc5cad1d708e502f9af9ff +#+system-config-rc.3e107d6605d964073d40a433806d63de154db4128c5fe4132f24f709c27ba1ac #+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378 -#+system-config-init.74757635ef25811c0186772cc477dda99e0b094af8e4e01b424ac4753fc2a3a2 +#+system-config-init.be9c577e88456f587d84a9da7387ecfa884c0516081e7b89b5e38da7183f535c #+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.0727e78bb3c5b14ffd4659941e9a75a677a6b940a983fb731c8c7a18773d5fed' \ + 'pthbs_path_containers=/versions/env.62d0da0155b7929e6afce696d6532486577f92316d5cd3082b4467e605d5d8da' \ '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.4973c3015e4dcf7ec9a14cb1a22d0b649703c3c87e1e3428aad1485e3b6c3fff +#+system-config-rc.3e107d6605d964073d40a433806d63de154db4128c5fe4132f24f709c27ba1ac -s6rcdb=/versions/system-config-rc.4973c3015e4dcf7ec9a14cb1a22d0b649703c3c87e1e3428aad1485e3b6c3fff/config/s6-rc-db +s6rcdb=/versions/system-config-rc.3e107d6605d964073d40a433806d63de154db4128c5fe4132f24f709c27ba1ac/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.04ee3598969545f7489352578b219823e819f6e71026bff2aa18841cf6bbc789 +#+system-config.efbf08f74e133cff7426bb4af26e72d0649619f303bc5cad1d708e502f9af9ff def_prefix() { prefix=/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/versions/system-config.04ee3598969545f7489352578b219823e819f6e71026bff2aa18841cf6bbc789/config/s6-rc-source +src=/versions/system-config.efbf08f74e133cff7426bb4af26e72d0649619f303bc5cad1d708e502f9af9ff/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.7ba1b40c117de79f020ab32f3f11a33b3d447ed5d2a54d8b5c5c1ad8e79bdd71 +#+containers.f93855f1ba4f2038eac25745f68b39aa17414ba814a67695790e94c95d976397 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5