pthbs_genpkgpy

commit 2f03ce3704ed69bc87f56f23a7dba0df2f8e141e
parent af200830921c4167181862e92477763315d2fba7
Author: ccx <ccx@te2000.cz>
Date:   Sun, 10 Mar 2024 15:52:49 +0000

Remove nosuid from init as it drops all caps on exec

Diffstat:
M
packages/core-system-init
 | 
2
--
M
packages/default.environment
 | 
2
+-
M
templates/pkg/core-system-init
 | 
2
--

3 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/packages/core-system-init b/packages/core-system-init
@@ -5,7 +5,6 @@
 #+s6-portable-utils.39f4babb8cd30769f1a931708e5442244b0305c36ddafe32348c7dc30c000b00
 #+s6-linux-init.396413eed542c149346f51a569f2d686c03b2104f4d062f52422e444ad9b502d
 #+execline.9d9d14aad09d9643f578727ab1ed3363b975772358c4ac8e756abdad4fca7a3d
-#+nosuid.ae35bf3fa1605f01e99b2c4c54b11da0156890c3ce38de1e26618f5db06b84f6
 #+core-system-rc.9604d0dac18456fc5af77ea9ab16dca585ad5fcb5854945b47281b1295a3f582
 
 s6rcdb=/versions/core-system-rc.9604d0dac18456fc5af77ea9ab16dca585ad5fcb5854945b47281b1295a3f582/config/s6-rc-db
@@ -50,7 +49,6 @@ el=$prefix/deps/command/$name
 s6-cat >"$pkgdir/bin/init.new" <<EOF || exit $?
 #!$el -S0
 $(qx pthbs-enter)
-$(qx nosuid)
 $(qx s6-envdir) -I /run/current/env
 EOF
 s6-cat >>"$pkgdir/bin/init.new" <"$pkgdir/bin/init"
diff --git a/packages/default.environment b/packages/default.environment
@@ -1,7 +1,7 @@
 #+core-system-conf.77e085927bd24f87018573434d43d14ea7ac1e92bb2a724bd0786e4e7eb31190
 #+core-system-rc.9604d0dac18456fc5af77ea9ab16dca585ad5fcb5854945b47281b1295a3f582
 #+core-system-scripts.132a3b1c6b226dee79156049db1244ebeacdf5a4bfcffc74b6b97175dad000fd
-#+core-system-init.933b54f3eb5efe84f5d13bdb123089935a2e0db809b71be37193db46a0b8e6cb
+#+core-system-init.241086865d7897cba12a880be6343e775307a00c1f47bf9a11b00514d48959a6
 #+busybox.e60885fe93ee85c01831673bb29f0e62a64903f4ce3094e3dc35bc8ec8887ad9
 #+gnu-make.782c9e6625fd7420e2cd38b847afed19db3b3844cae8a0426a0dbf73e10d78e5
 #+musl-cross-make.65f98305f5666435bf0c6b9ccedffae2179ff1b3286752756886f760cf7771d2
diff --git a/templates/pkg/core-system-init b/templates/pkg/core-system-init
@@ -6,7 +6,6 @@
 #+{{pkg_install_name("s6-portable-utils")}}
 #+{{pkg_install_name("s6-linux-init")}}
 #+{{pkg_install_name("execline")}}
-#+{{pkg_install_name("nosuid")}}
 #+{{pkg_install_name("core-system-rc")}}
 
 s6rcdb={{pkg_install_dir("core-system-rc")}}/config/s6-rc-db
@@ -51,7 +50,6 @@ el=$prefix/deps/command/$name
 s6-cat >"$pkgdir/bin/init.new" <<EOF || exit $?
 #!$el -S0
 $(qx pthbs-enter)
-$(qx nosuid)
 $(qx s6-envdir) -I /run/current/env
 EOF
 s6-cat >>"$pkgdir/bin/init.new" <"$pkgdir/bin/init"