diff options
author | Zach van Rijn <me@zv.io> | 2023-11-16 23:18:19 +0000 |
---|---|---|
committer | Zach van Rijn <me@zv.io> | 2023-11-17 19:50:35 +0000 |
commit | 318cd1f0969c07ab225754ebe2b687654c417dbf (patch) | |
tree | 3806b32411ad29b7239d28a160defc875f858d5c | |
parent | 0ad93f758ce2b0678e0bd9cdd0b000456c33ebea (diff) | |
download | image-318cd1f0969c07ab225754ebe2b687654c417dbf.tar.gz image-318cd1f0969c07ab225754ebe2b687654c417dbf.tar.bz2 image-318cd1f0969c07ab225754ebe2b687654c417dbf.tar.xz image-318cd1f0969c07ab225754ebe2b687654c417dbf.zip |
adelie-build-txz: improve permissions alignment w/ 'hscript-image'
As used by 'automedia', directory permissions for '/root' were too
permissive. A change to this script and separately to 'automedia'
are required in order to have '/root' be 0700. To facilitate the
bind mounts for installing QEMU emulators for media creation, this
directory was inadvertently created with the wrong umask.
The '/usr', '/usr/sbin', and '/etc' directories were found to be
inconsistent with the output of 'hscript-image' for rootfs tarball
media, so the appropriate umask is now set.
A full audit for permissions should be performed.
-rwxr-xr-x | adelie-build-txz | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/adelie-build-txz b/adelie-build-txz index 71b2d1b..a41ddf2 100755 --- a/adelie-build-txz +++ b/adelie-build-txz @@ -133,15 +133,28 @@ install_pkgs() { readonly ARCH_PKGS="$(cat packages/arch/$ARCH 2>/dev/null | tr '\n' ' ' || echo '')" fi - mkdir -p rootfs-$ARCH/etc/apk + ( + umask 022 + mkdir -p rootfs-$ARCH/etc/apk + ) cp -r /etc/apk/keys rootfs-$ARCH/etc/apk/ + # Disable grub trigger. mkdir -p rootfs-$ARCH/etc/default printf "ADELIE_MANUAL_CONFIG=1\n" >> rootfs-$ARCH/etc/default/grub + mkdir -p rootfs-$ARCH/dev mknod rootfs-$ARCH/dev/urandom c 1 9 - mkdir -p rootfs-$ARCH/usr/sbin - mkdir -p rootfs-$ARCH/root + + ( + umask 022 + mkdir -p rootfs-$ARCH/usr/sbin + ) + + ( + umask 077 + mkdir -p rootfs-$ARCH/root + ) cp -r bin rootfs-$ARCH/root/bin apk --arch $ARCH \ ${CACHE:+--cache-dir "${CACHE}"} \ |