manuel
/
void-mklive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mklive.sh: ensure dash is /bin/sh if installed

This commit is contained in:
classabbyamp 2024-12-26 14:08:46 -05:00 committed by classabbyamp
parent 06fe42b5f2
commit c99cafb613
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mklive.sh
View File

@ -164,13 +164,21 @@ install_packages() {
if [ -f "$ROOTFS"/etc/default/libc-locales ]; then if [ -f "$ROOTFS"/etc/default/libc-locales ]; then
sed -e "s/\#\(${LOCALE}.*\)/\1/g" -i "$ROOTFS"/etc/default/libc-locales sed -e "s/\#\(${LOCALE}.*\)/\1/g" -i "$ROOTFS"/etc/default/libc-locales
fi fi
if XBPS_ARCH=$BASE_ARCH "$XBPS_QUERY_CMD" -r "$ROOTFS" dkms >/dev/null 2>&1; then if XBPS_ARCH=$BASE_ARCH "$XBPS_QUERY_CMD" -r "$ROOTFS" dkms >/dev/null 2>&1; then
# dkms modules alphabetically before dkms can't configure # dkms modules alphabetically before dkms can't configure
# if dkms hasn't configured beforehand to create /var/lib/dkms # if dkms hasn't configured beforehand to create /var/lib/dkms
chroot "$ROOTFS" env -i xbps-reconfigure dkms chroot "$ROOTFS" env -i xbps-reconfigure dkms
fi fi
chroot "$ROOTFS" env -i xbps-reconfigure -a chroot "$ROOTFS" env -i xbps-reconfigure -a
if XBPS_ARCH=$BASE_ARCH "$XBPS_QUERY_CMD" -r "$ROOTFS" dash >/dev/null 2>&1; then
# bash configures alphabetically before dash,
# so if it's installed we should ensure it's /bin/sh
chroot "$ROOTFS" env -i xbps-alternatives -s dash
fi
post_install_packages post_install_packages
} }