mrrl

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

commit 4c478750033f57fcd6f6bbcbe86d49b58d3ef130
parent ecc591325b8a88cdc4333f2692a50324f3d5d1dc
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue,  9 Dec 2025 15:06:58 +0000

remove nologin applet

Diffstat:
Mtemplates/pkg/busybox-shadow | 1-
Mvariants/ccx-x86_64/busybox-shadow | 1-
Mvariants/ccx-x86_64/container-bin-image | 2+-
Mvariants/ccx-x86_64/containers | 8++++----
Mvariants/ccx-x86_64/containers.environment | 4++--
Mvariants/ccx-x86_64/default.environment | 10+++++-----
Mvariants/ccx-x86_64/mdevd.environment | 2+-
Mvariants/ccx-x86_64/system-config | 6+++---
Mvariants/ccx-x86_64/system-config-init | 6+++---
Mvariants/ccx-x86_64/system-config-rc | 4++--
Mvariants/ccx-x86_64/userspace.environment | 4++--
Mvariants/root-x86_64/busybox-shadow | 1-
Mvariants/root-x86_64/container-bin-image | 2+-
Mvariants/root-x86_64/containers | 8++++----
Mvariants/root-x86_64/containers.environment | 4++--
Mvariants/root-x86_64/default.environment | 10+++++-----
Mvariants/root-x86_64/mdevd.environment | 2+-
Mvariants/root-x86_64/system-config | 6+++---
Mvariants/root-x86_64/system-config-init | 6+++---
Mvariants/root-x86_64/system-config-rc | 4++--
Mvariants/root-x86_64/userspace.environment | 4++--
21 files changed, 46 insertions(+), 49 deletions(-)

diff --git a/templates/pkg/busybox-shadow b/templates/pkg/busybox-shadow @@ -9,7 +9,6 @@ delgroup \ deluser \ groups \ mkpasswd \ -nologin \ passwd \ remove-shell \ vlock diff --git a/variants/ccx-x86_64/busybox-shadow b/variants/ccx-x86_64/busybox-shadow @@ -16,7 +16,6 @@ delgroup \ deluser \ groups \ mkpasswd \ -nologin \ passwd \ remove-shell \ vlock; do diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -39,7 +39,7 @@ #+busybox-linux-extra.7dc3b7b60595c62f8dd970f6c05fe3d312607cb7cc5b69f58ae410d9ae4ffd33 #+busybox-mtd-utils.b8334cadc3c32d88259754442595397857076b04f2b7ff9dfa6423059d638251 -#+busybox-shadow.2f3824c27ade948d5d325d2fa40a9052c8ea3c0e045eb2d858315a09ca02fc82 +#+busybox-shadow.f34c11ffe40dc4aeb018ed0860115135203b47dc8662079384459771505402d0 #+busybox-su.e6e9417b08d76a7b6bd4cafb582ea79fc21d67dd7202c8f36da6ca6c10ac6cfd #+busybox-util-linux-priv.fe8407a7762ebc0804b125f31244fc42f9dc89197bae51ee4fbc04406bdfb7df #+busybox-logging.623712e57c085735d389b2f908e1ea2baadff835be7b47ca9ccce7d22fec6dff diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -33,7 +33,7 @@ #+alpine-keys.c8bb41248d09ffcf322c8512f721a0635ae196d5d653e62a4ef45408c79a0b12 #+apk-tools.23857f9f3faeb9fb1c9c24eff372668002fa58e66f0cdc778a2fc54e876b0fbd #+xbps.4f79558204354c7762a936383315cb2876d925020b7a58eaf547ad8334517e4a -#+container-bin-image.5fd04567055b0c1d67e663af3ccea26fa65497da6947096364ba9e895485ea52 +#+container-bin-image.3f9179de0816d8196c3cde1b5d57317b074916f6a2b1499196e61206818ea147 #@git:9820dbea1cf5060d7d04632f0fed7e91ea608309:containers @@ -91,9 +91,9 @@ for f in '/home/ccx/versions/xbps.4f79558204354c7762a936383315cb2876d925020b7a58 ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.5fd04567055b0c1d67e663af3ccea26fa65497da6947096364ba9e895485ea52/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.5fd04567055b0c1d67e663af3ccea26fa65497da6947096364ba9e895485ea52/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.5fd04567055b0c1d67e663af3ccea26fa65497da6947096364ba9e895485ea52/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.3f9179de0816d8196c3cde1b5d57317b074916f6a2b1499196e61206818ea147/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.3f9179de0816d8196c3cde1b5d57317b074916f6a2b1499196e61206818ea147/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.3f9179de0816d8196c3cde1b5d57317b074916f6a2b1499196e61206818ea147/container-bin-image' "${dest}/deps/" diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -39,7 +39,7 @@ #+busybox-linux-extra.7dc3b7b60595c62f8dd970f6c05fe3d312607cb7cc5b69f58ae410d9ae4ffd33 #+busybox-mtd-utils.b8334cadc3c32d88259754442595397857076b04f2b7ff9dfa6423059d638251 -#+busybox-shadow.2f3824c27ade948d5d325d2fa40a9052c8ea3c0e045eb2d858315a09ca02fc82 +#+busybox-shadow.f34c11ffe40dc4aeb018ed0860115135203b47dc8662079384459771505402d0 #+busybox-su.e6e9417b08d76a7b6bd4cafb582ea79fc21d67dd7202c8f36da6ca6c10ac6cfd #+busybox-util-linux-priv.fe8407a7762ebc0804b125f31244fc42f9dc89197bae51ee4fbc04406bdfb7df #+busybox-logging.623712e57c085735d389b2f908e1ea2baadff835be7b47ca9ccce7d22fec6dff @@ -51,7 +51,7 @@ #+s6-linux-utils.95a2df7e2d066fb681e1150258dbe7112351293675ff6ee5e27694a606fcf883 #+zsh.204e2572ea8e4f1be4d29d93e63f799c6cd2506cf2ae53c6aa0be51bbde000a6 #+confz.c3a48c0bcc5945e4896a7a4d22e0291f33a0f6b70025ccb517e430d23cedb5c8 -#+containers.01282a5184ccb9c51cccee0e10ba8dbf367ab651120b3da5ff396ffc3280a361 +#+containers.0a42e40277ce1158934ee65ae1069716fa2145abbfa7afd4259cc058818218bd #+xbps.4f79558204354c7762a936383315cb2876d925020b7a58eaf547ad8334517e4a #+zstd.b8cb1e29cd9887dd0e6ec51e9f05b3d3396334ffae1338c5003d5fc8024de995 #+apk-tools.23857f9f3faeb9fb1c9c24eff372668002fa58e66f0cdc778a2fc54e876b0fbd diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -39,7 +39,7 @@ #+busybox-linux-extra.7dc3b7b60595c62f8dd970f6c05fe3d312607cb7cc5b69f58ae410d9ae4ffd33 #+busybox-mtd-utils.b8334cadc3c32d88259754442595397857076b04f2b7ff9dfa6423059d638251 -#+busybox-shadow.2f3824c27ade948d5d325d2fa40a9052c8ea3c0e045eb2d858315a09ca02fc82 +#+busybox-shadow.f34c11ffe40dc4aeb018ed0860115135203b47dc8662079384459771505402d0 #+busybox-su.e6e9417b08d76a7b6bd4cafb582ea79fc21d67dd7202c8f36da6ca6c10ac6cfd #+busybox-util-linux-priv.fe8407a7762ebc0804b125f31244fc42f9dc89197bae51ee4fbc04406bdfb7df #+busybox-logging.623712e57c085735d389b2f908e1ea2baadff835be7b47ca9ccce7d22fec6dff @@ -66,7 +66,7 @@ #+pthbs-banginstall.4de9e134a46998bef7865b156e8ab0a982f91699fa420291460ebd5b9093cff0 #+aat.22cce8f1700b4bc980599181c61d99efa6fe7520451cdfc0d3a9a0f1b2a1625e #+confz.c3a48c0bcc5945e4896a7a4d22e0291f33a0f6b70025ccb517e430d23cedb5c8 -#+containers.01282a5184ccb9c51cccee0e10ba8dbf367ab651120b3da5ff396ffc3280a361 +#+containers.0a42e40277ce1158934ee65ae1069716fa2145abbfa7afd4259cc058818218bd #+fileset.a1b59203939febc3d3a75be588cf6fe1b24da43b5be11fab9b6cfcb499c1b1f0 #+logincaps.7ccc3183031e917a54565312656adb94756576aa445f9c20277a9a51562675de #+snaprep.4a4a2082b4a14e8ca0fcee5efea38841544c6b6a461d3cdd658fa0f895d321b8 @@ -89,9 +89,9 @@ #+squashfs-tools.69e9d45faeacc93412c721d9cffef21a9dd3841af30a4abe43dedf8abfad3a4f #+mandoc.8c1f103a33b6dbadb7e80b7f6a0beaec41ca6717e472db6eb4b2a0411566c02d #+tinyssh.b112f7cd172e5cf53912a3f175ad19c884b1e2f807557b7076f2a1234aec58a7 -#+system-config.589b989293feb83cf008e673704fb6ea96bf30698832aac200a685750e42908d -#+system-config-rc.b1ad0c6ffd7de96866a55b3967e6a9c6b4f3b62a4cafd22fc68766772873b21e +#+system-config.fab4728b394cf495eddbe4cedc0e462f3db1b7763a0e755ee788bb66b5c2873c +#+system-config-rc.d60a9532112b5a3a6d69b16ceff108917924fb92eb85a5cd1357527aab39ef07 #+system-config-scripts.ec0180827a1947147f639d60d33adc07cceae930cc057f1329313407dd9e38cb -#+system-config-init.627b3b67935de4131325fbb131d0c62dcd030823f22a88fd2159929108b1d9b9 +#+system-config-init.76076934e8f5db1199fc4d67711d392af3c7c5bba9b3171cbfbd8a37a30f9778 #+system-config-zsh.77058d941abb2d228953c986c2953fc3f4f40722431dfa9ed024b7a8d4890ce9 #+busybox.2401c28dd70bd3cd6549a87ef283383b9dd984e938688ab196a66c8e7dcb0f9b \ No newline at end of file diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment @@ -39,7 +39,7 @@ #+busybox-linux-extra.7dc3b7b60595c62f8dd970f6c05fe3d312607cb7cc5b69f58ae410d9ae4ffd33 #+busybox-mtd-utils.b8334cadc3c32d88259754442595397857076b04f2b7ff9dfa6423059d638251 -#+busybox-shadow.2f3824c27ade948d5d325d2fa40a9052c8ea3c0e045eb2d858315a09ca02fc82 +#+busybox-shadow.f34c11ffe40dc4aeb018ed0860115135203b47dc8662079384459771505402d0 #+busybox-su.e6e9417b08d76a7b6bd4cafb582ea79fc21d67dd7202c8f36da6ca6c10ac6cfd #+busybox-util-linux-priv.fe8407a7762ebc0804b125f31244fc42f9dc89197bae51ee4fbc04406bdfb7df #+busybox-logging.623712e57c085735d389b2f908e1ea2baadff835be7b47ca9ccce7d22fec6dff diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -39,7 +39,7 @@ #+busybox-linux-extra.7dc3b7b60595c62f8dd970f6c05fe3d312607cb7cc5b69f58ae410d9ae4ffd33 #+busybox-mtd-utils.b8334cadc3c32d88259754442595397857076b04f2b7ff9dfa6423059d638251 -#+busybox-shadow.2f3824c27ade948d5d325d2fa40a9052c8ea3c0e045eb2d858315a09ca02fc82 +#+busybox-shadow.f34c11ffe40dc4aeb018ed0860115135203b47dc8662079384459771505402d0 #+busybox-su.e6e9417b08d76a7b6bd4cafb582ea79fc21d67dd7202c8f36da6ca6c10ac6cfd #+busybox-util-linux-priv.fe8407a7762ebc0804b125f31244fc42f9dc89197bae51ee4fbc04406bdfb7df #+busybox-logging.623712e57c085735d389b2f908e1ea2baadff835be7b47ca9ccce7d22fec6dff @@ -98,8 +98,8 @@ 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.389b5d463ae2093e6b253e706f2db658b4927cdec567d41902b63b391c3f9ddd' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.78326d54d7fa67fdfb36aa83baa88390b67fa7d20b037f4a9781f4fabcc84a45' \ + 'pthbs_path_containers=/home/ccx/versions/env.ba6a3fbff7c8ef78fc6735f049a2bff94027e3fe30a201063f413bcb95feff9c' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.2f7a0227fe66770e06469bbd8b2de131aff4312610cf9d81f252cc0aa74c55e5' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init @@ -41,7 +41,7 @@ #+busybox-linux-extra.7dc3b7b60595c62f8dd970f6c05fe3d312607cb7cc5b69f58ae410d9ae4ffd33 #+busybox-mtd-utils.b8334cadc3c32d88259754442595397857076b04f2b7ff9dfa6423059d638251 -#+busybox-shadow.2f3824c27ade948d5d325d2fa40a9052c8ea3c0e045eb2d858315a09ca02fc82 +#+busybox-shadow.f34c11ffe40dc4aeb018ed0860115135203b47dc8662079384459771505402d0 #+busybox-su.e6e9417b08d76a7b6bd4cafb582ea79fc21d67dd7202c8f36da6ca6c10ac6cfd #+busybox-util-linux-priv.fe8407a7762ebc0804b125f31244fc42f9dc89197bae51ee4fbc04406bdfb7df #+busybox-logging.623712e57c085735d389b2f908e1ea2baadff835be7b47ca9ccce7d22fec6dff @@ -51,7 +51,7 @@ #+s6-portable-utils.f753d6dcce889afe92a56f46fd51ab4c436cb213614f0dd4ca1c5b5c83d4f321 #+s6-linux-init.6c9dbd0bb3cb7017007947cf78dd3d131d1de513125bfb2abdb34c8caa02a8ff #+execline.4780cf604005e1562101dbe04d32b59ef73d531d3c0bdd1b7d78199523b863f3 -#+system-config-rc.b1ad0c6ffd7de96866a55b3967e6a9c6b4f3b62a4cafd22fc68766772873b21e +#+system-config-rc.d60a9532112b5a3a6d69b16ceff108917924fb92eb85a5cd1357527aab39ef07 # - build script start - @@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.b1ad0c6ffd7de96866a55b3967e6a9c6b4f3b62a4cafd22fc68766772873b21e/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.d60a9532112b5a3a6d69b16ceff108917924fb92eb85a5cd1357527aab39ef07/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//home/ccx/versions" diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc @@ -30,7 +30,7 @@ #+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113 #+s6-rc.d4cc5c986ffc8e66536ec95ee2cd6c66f32e857a7b2919be1ebf417cc3b14599 #+fileset.a1b59203939febc3d3a75be588cf6fe1b24da43b5be11fab9b6cfcb499c1b1f0 -#+system-config.589b989293feb83cf008e673704fb6ea96bf30698832aac200a685750e42908d +#+system-config.fab4728b394cf495eddbe4cedc0e462f3db1b7763a0e755ee788bb66b5c2873c # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.589b989293feb83cf008e673704fb6ea96bf30698832aac200a685750e42908d/config/s6-rc-source +src=/home/ccx/versions/system-config.fab4728b394cf495eddbe4cedc0e462f3db1b7763a0e755ee788bb66b5c2873c/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 @@ -39,7 +39,7 @@ #+busybox-linux-extra.7dc3b7b60595c62f8dd970f6c05fe3d312607cb7cc5b69f58ae410d9ae4ffd33 #+busybox-mtd-utils.b8334cadc3c32d88259754442595397857076b04f2b7ff9dfa6423059d638251 -#+busybox-shadow.2f3824c27ade948d5d325d2fa40a9052c8ea3c0e045eb2d858315a09ca02fc82 +#+busybox-shadow.f34c11ffe40dc4aeb018ed0860115135203b47dc8662079384459771505402d0 #+busybox-su.e6e9417b08d76a7b6bd4cafb582ea79fc21d67dd7202c8f36da6ca6c10ac6cfd #+busybox-util-linux-priv.fe8407a7762ebc0804b125f31244fc42f9dc89197bae51ee4fbc04406bdfb7df #+busybox-logging.623712e57c085735d389b2f908e1ea2baadff835be7b47ca9ccce7d22fec6dff @@ -66,7 +66,7 @@ #+pthbs-banginstall.4de9e134a46998bef7865b156e8ab0a982f91699fa420291460ebd5b9093cff0 #+aat.22cce8f1700b4bc980599181c61d99efa6fe7520451cdfc0d3a9a0f1b2a1625e #+confz.c3a48c0bcc5945e4896a7a4d22e0291f33a0f6b70025ccb517e430d23cedb5c8 -#+containers.01282a5184ccb9c51cccee0e10ba8dbf367ab651120b3da5ff396ffc3280a361 +#+containers.0a42e40277ce1158934ee65ae1069716fa2145abbfa7afd4259cc058818218bd #+fileset.a1b59203939febc3d3a75be588cf6fe1b24da43b5be11fab9b6cfcb499c1b1f0 #+logincaps.7ccc3183031e917a54565312656adb94756576aa445f9c20277a9a51562675de #+snaprep.4a4a2082b4a14e8ca0fcee5efea38841544c6b6a461d3cdd658fa0f895d321b8 diff --git a/variants/root-x86_64/busybox-shadow b/variants/root-x86_64/busybox-shadow @@ -16,7 +16,6 @@ delgroup \ deluser \ groups \ mkpasswd \ -nologin \ passwd \ remove-shell \ vlock; do diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -39,7 +39,7 @@ #+busybox-linux-extra.26fdba68b1a222d8899efba006540dfd9c48e7f2be64e5365c5e8d3232e8c083 #+busybox-mtd-utils.6271fc72ba6cfd73c8a0321436497efaa6ded2b09a5d69007aefca88bf9cf914 -#+busybox-shadow.9459fa37c0b140427a2d4829bd320ee40b9c7039b7c61a12e05b8b510c4e5faf +#+busybox-shadow.adb33086098147ca37d1970d011359ce7e54a1bedce73ec26524a1e47e48308c #+busybox-su.d49f13217d1a208d121cd271d25c47363ff7af3031e6229b9ffe344db663c7cc #+busybox-util-linux-priv.5f29bd71ed8b27e2bdfcf6582438e331a21742d10464863bedbe135f457c7d52 #+busybox-logging.0419bbfd02f6955640a6ec1a2171eb801c2498d1f723629f2202379ee7d97a7b diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -33,7 +33,7 @@ #+alpine-keys.9b1aa21151ca8e578750b4a535211197f6814226eaf71e85e5a2f726abafd2f1 #+apk-tools.a849c0936b59621cfc2ce73163bc215e12a81079ead85767f3d7e30a80a74ee7 #+xbps.52308e3ce61863032cea938ab1684d2f8b78d2e762f5aa36f2c7f28aae06332a -#+container-bin-image.2afcd4c17e37c8ca6caab5a8acae62ad8f376ea78539e3c4b673f4265de048e0 +#+container-bin-image.ece689605a63673f530a43b86a93f2b48580616220f74ab2b991309d40f5e044 #@git:9820dbea1cf5060d7d04632f0fed7e91ea608309:containers @@ -91,9 +91,9 @@ for f in '/versions/xbps.52308e3ce61863032cea938ab1684d2f8b78d2e762f5aa36f2c7f28 ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.2afcd4c17e37c8ca6caab5a8acae62ad8f376ea78539e3c4b673f4265de048e0/container-bin-image' -test -f '/versions/container-bin-image.2afcd4c17e37c8ca6caab5a8acae62ad8f376ea78539e3c4b673f4265de048e0/container-bin-image/if' -ln -sf '/versions/container-bin-image.2afcd4c17e37c8ca6caab5a8acae62ad8f376ea78539e3c4b673f4265de048e0/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.ece689605a63673f530a43b86a93f2b48580616220f74ab2b991309d40f5e044/container-bin-image' +test -f '/versions/container-bin-image.ece689605a63673f530a43b86a93f2b48580616220f74ab2b991309d40f5e044/container-bin-image/if' +ln -sf '/versions/container-bin-image.ece689605a63673f530a43b86a93f2b48580616220f74ab2b991309d40f5e044/container-bin-image' "${dest}/deps/" diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -39,7 +39,7 @@ #+busybox-linux-extra.26fdba68b1a222d8899efba006540dfd9c48e7f2be64e5365c5e8d3232e8c083 #+busybox-mtd-utils.6271fc72ba6cfd73c8a0321436497efaa6ded2b09a5d69007aefca88bf9cf914 -#+busybox-shadow.9459fa37c0b140427a2d4829bd320ee40b9c7039b7c61a12e05b8b510c4e5faf +#+busybox-shadow.adb33086098147ca37d1970d011359ce7e54a1bedce73ec26524a1e47e48308c #+busybox-su.d49f13217d1a208d121cd271d25c47363ff7af3031e6229b9ffe344db663c7cc #+busybox-util-linux-priv.5f29bd71ed8b27e2bdfcf6582438e331a21742d10464863bedbe135f457c7d52 #+busybox-logging.0419bbfd02f6955640a6ec1a2171eb801c2498d1f723629f2202379ee7d97a7b @@ -51,7 +51,7 @@ #+s6-linux-utils.b35ecc2582e9782dcba1cbe8859864b9471cdbc0bd864b974cf4db35b182df4b #+zsh.37f5c3061fd1d1ac5031ec768c5ffc2e16e0b6483eb9674d6990c6b013e65097 #+confz.64afba2dc5ea7cba05e348652e44173fcd4ccab41dae492230fe29b5892cef1f -#+containers.8ef3976cf079fafb47282a2f92ece37f5433ddcbd16ca1af0c7df8604c3e8eca +#+containers.dcb7d972b1bc92bbe0135f8d86dc7bbdd6a2b5affd2a8dd0af531e4fc0df3516 #+xbps.52308e3ce61863032cea938ab1684d2f8b78d2e762f5aa36f2c7f28aae06332a #+zstd.110e8ae24ae23fe787bf4a56199aa1c3fa4eda9718d58a4bc6310ebf5c038561 #+apk-tools.a849c0936b59621cfc2ce73163bc215e12a81079ead85767f3d7e30a80a74ee7 diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -39,7 +39,7 @@ #+busybox-linux-extra.26fdba68b1a222d8899efba006540dfd9c48e7f2be64e5365c5e8d3232e8c083 #+busybox-mtd-utils.6271fc72ba6cfd73c8a0321436497efaa6ded2b09a5d69007aefca88bf9cf914 -#+busybox-shadow.9459fa37c0b140427a2d4829bd320ee40b9c7039b7c61a12e05b8b510c4e5faf +#+busybox-shadow.adb33086098147ca37d1970d011359ce7e54a1bedce73ec26524a1e47e48308c #+busybox-su.d49f13217d1a208d121cd271d25c47363ff7af3031e6229b9ffe344db663c7cc #+busybox-util-linux-priv.5f29bd71ed8b27e2bdfcf6582438e331a21742d10464863bedbe135f457c7d52 #+busybox-logging.0419bbfd02f6955640a6ec1a2171eb801c2498d1f723629f2202379ee7d97a7b @@ -66,7 +66,7 @@ #+pthbs-banginstall.b6b5e6d9dec22814cb135d4963a1d700423c809136eb606adbed94580a8340db #+aat.0ca9120400577e964d5ca55aab317581e39289b0cf54762bff3f311e171f9139 #+confz.64afba2dc5ea7cba05e348652e44173fcd4ccab41dae492230fe29b5892cef1f -#+containers.8ef3976cf079fafb47282a2f92ece37f5433ddcbd16ca1af0c7df8604c3e8eca +#+containers.dcb7d972b1bc92bbe0135f8d86dc7bbdd6a2b5affd2a8dd0af531e4fc0df3516 #+fileset.f3d98e98bdf776a240368d011cfa8f566081653c6c0fffd59559f7a53fc9f188 #+logincaps.1c701849351714549d8ccb12b7acd7183323cd6dcebed800084409026cf846b8 #+snaprep.e24df12a5fa3728cbd0877242ac2b62f0795ca0a3de1ed4b11f7c36433134afa @@ -89,9 +89,9 @@ #+squashfs-tools.b1ee8df87d466f7c96b5ad7de162fd09f0660d9db73502bd971239826b930b0c #+mandoc.40118a076c8fc8eeca4ad237b81d4a3f64f27f8afcb7889d63dd2833224d02ad #+tinyssh.45816c81b212e507a675da2e2332fa429255e00041647f583137fe2cb3352d1f -#+system-config.7437e9d512f9b0462dab4bc892f8fdc9d004b0f8f91a3e6c9da483c365db23b5 -#+system-config-rc.43e3ad440eeca8750cf1cdf0459cf093681eaa45d14b869a03f511eef2dc7e64 +#+system-config.f41a686676b3f9e56fe3396e80649b1ab9d438673362537963f7f8f7e15ac4f0 +#+system-config-rc.9ebb71d656c4137074f2af2c4b28822cbec3d59f4edba584909a50cd2e1181e5 #+system-config-scripts.44ce2b8c4a2faa31497d93aa73baf33ec5a9265742f40f81ba4cd8e9337b4f3e -#+system-config-init.0ac4296e13b7422854925d0793ac2b76302c8afe62a9cf07bbb725615d1ac272 +#+system-config-init.524852dce4767ad554fb71d8f1a82aa69772546271620b8389c0178e472f97c6 #+system-config-zsh.bdc1129f0e2b2d7e35d6ea3127fe8a3043bb53fcfee28db5d56cba00ee656b70 #+busybox-modutils.93d416beb5674f923667d1ea46141f25757bb42a2c6d05d1aa6fdc870e47d38d \ No newline at end of file diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment @@ -39,7 +39,7 @@ #+busybox-linux-extra.26fdba68b1a222d8899efba006540dfd9c48e7f2be64e5365c5e8d3232e8c083 #+busybox-mtd-utils.6271fc72ba6cfd73c8a0321436497efaa6ded2b09a5d69007aefca88bf9cf914 -#+busybox-shadow.9459fa37c0b140427a2d4829bd320ee40b9c7039b7c61a12e05b8b510c4e5faf +#+busybox-shadow.adb33086098147ca37d1970d011359ce7e54a1bedce73ec26524a1e47e48308c #+busybox-su.d49f13217d1a208d121cd271d25c47363ff7af3031e6229b9ffe344db663c7cc #+busybox-util-linux-priv.5f29bd71ed8b27e2bdfcf6582438e331a21742d10464863bedbe135f457c7d52 #+busybox-logging.0419bbfd02f6955640a6ec1a2171eb801c2498d1f723629f2202379ee7d97a7b diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -39,7 +39,7 @@ #+busybox-linux-extra.26fdba68b1a222d8899efba006540dfd9c48e7f2be64e5365c5e8d3232e8c083 #+busybox-mtd-utils.6271fc72ba6cfd73c8a0321436497efaa6ded2b09a5d69007aefca88bf9cf914 -#+busybox-shadow.9459fa37c0b140427a2d4829bd320ee40b9c7039b7c61a12e05b8b510c4e5faf +#+busybox-shadow.adb33086098147ca37d1970d011359ce7e54a1bedce73ec26524a1e47e48308c #+busybox-su.d49f13217d1a208d121cd271d25c47363ff7af3031e6229b9ffe344db663c7cc #+busybox-util-linux-priv.5f29bd71ed8b27e2bdfcf6582438e331a21742d10464863bedbe135f457c7d52 #+busybox-logging.0419bbfd02f6955640a6ec1a2171eb801c2498d1f723629f2202379ee7d97a7b @@ -98,8 +98,8 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/versions/env.99ea44fb6d08a6275ab5f02da8819b0d1210e1b193531c0782e69d4e48c4bff6' \ - 'pthbs_path_mdevd=/versions/env.8653c1e79060781b4e074a43c178f1fc2ea58ace238919ce8165cd730e58375c' \ + 'pthbs_path_containers=/versions/env.c8976e4331ec0213da494f9402972641e61569bc84e1eb6812d384c42b90afa4' \ + 'pthbs_path_mdevd=/versions/env.0c846d92ecc163d933f6a7d6f984dedf3c933bc09ea40ea7cecdc390fbfcc942' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init @@ -41,7 +41,7 @@ #+busybox-linux-extra.26fdba68b1a222d8899efba006540dfd9c48e7f2be64e5365c5e8d3232e8c083 #+busybox-mtd-utils.6271fc72ba6cfd73c8a0321436497efaa6ded2b09a5d69007aefca88bf9cf914 -#+busybox-shadow.9459fa37c0b140427a2d4829bd320ee40b9c7039b7c61a12e05b8b510c4e5faf +#+busybox-shadow.adb33086098147ca37d1970d011359ce7e54a1bedce73ec26524a1e47e48308c #+busybox-su.d49f13217d1a208d121cd271d25c47363ff7af3031e6229b9ffe344db663c7cc #+busybox-util-linux-priv.5f29bd71ed8b27e2bdfcf6582438e331a21742d10464863bedbe135f457c7d52 #+busybox-logging.0419bbfd02f6955640a6ec1a2171eb801c2498d1f723629f2202379ee7d97a7b @@ -51,7 +51,7 @@ #+s6-portable-utils.0974725b919b5a28547673a0c7aad2a437cce80f665a8369a38d0308d6d10929 #+s6-linux-init.42b09141cb0df87055550bb49d437f92f4dddb408731ffffb195fdc4a775626b #+execline.650c48270090abf56003b4f48ba5f3b8dc55c448e883e46a75aca7b8f22a6c38 -#+system-config-rc.43e3ad440eeca8750cf1cdf0459cf093681eaa45d14b869a03f511eef2dc7e64 +#+system-config-rc.9ebb71d656c4137074f2af2c4b28822cbec3d59f4edba584909a50cd2e1181e5 # - build script start - @@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.43e3ad440eeca8750cf1cdf0459cf093681eaa45d14b869a03f511eef2dc7e64/config/s6-rc-db +s6rcdb=/versions/system-config-rc.9ebb71d656c4137074f2af2c4b28822cbec3d59f4edba584909a50cd2e1181e5/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//versions" diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc @@ -30,7 +30,7 @@ #+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe #+s6-rc.61eb7877b92f98e0b01ddd2166d526551699710e4b33a7bb1d97916ed3bcf086 #+fileset.f3d98e98bdf776a240368d011cfa8f566081653c6c0fffd59559f7a53fc9f188 -#+system-config.7437e9d512f9b0462dab4bc892f8fdc9d004b0f8f91a3e6c9da483c365db23b5 +#+system-config.f41a686676b3f9e56fe3396e80649b1ab9d438673362537963f7f8f7e15ac4f0 # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.7437e9d512f9b0462dab4bc892f8fdc9d004b0f8f91a3e6c9da483c365db23b5/config/s6-rc-source +src=/versions/system-config.f41a686676b3f9e56fe3396e80649b1ab9d438673362537963f7f8f7e15ac4f0/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 @@ -39,7 +39,7 @@ #+busybox-linux-extra.26fdba68b1a222d8899efba006540dfd9c48e7f2be64e5365c5e8d3232e8c083 #+busybox-mtd-utils.6271fc72ba6cfd73c8a0321436497efaa6ded2b09a5d69007aefca88bf9cf914 -#+busybox-shadow.9459fa37c0b140427a2d4829bd320ee40b9c7039b7c61a12e05b8b510c4e5faf +#+busybox-shadow.adb33086098147ca37d1970d011359ce7e54a1bedce73ec26524a1e47e48308c #+busybox-su.d49f13217d1a208d121cd271d25c47363ff7af3031e6229b9ffe344db663c7cc #+busybox-util-linux-priv.5f29bd71ed8b27e2bdfcf6582438e331a21742d10464863bedbe135f457c7d52 #+busybox-logging.0419bbfd02f6955640a6ec1a2171eb801c2498d1f723629f2202379ee7d97a7b @@ -66,7 +66,7 @@ #+pthbs-banginstall.b6b5e6d9dec22814cb135d4963a1d700423c809136eb606adbed94580a8340db #+aat.0ca9120400577e964d5ca55aab317581e39289b0cf54762bff3f311e171f9139 #+confz.64afba2dc5ea7cba05e348652e44173fcd4ccab41dae492230fe29b5892cef1f -#+containers.8ef3976cf079fafb47282a2f92ece37f5433ddcbd16ca1af0c7df8604c3e8eca +#+containers.dcb7d972b1bc92bbe0135f8d86dc7bbdd6a2b5affd2a8dd0af531e4fc0df3516 #+fileset.f3d98e98bdf776a240368d011cfa8f566081653c6c0fffd59559f7a53fc9f188 #+logincaps.1c701849351714549d8ccb12b7acd7183323cd6dcebed800084409026cf846b8 #+snaprep.e24df12a5fa3728cbd0877242ac2b62f0795ca0a3de1ed4b11f7c36433134afa