From e36ab9758280450804baf6da169a02dd2845a042 Mon Sep 17 00:00:00 2001 From: BodgeMaster <> Date: Sun, 5 Apr 2026 21:23:35 +0200 Subject: [PATCH] kernel.d/post-install/99-void-usb: simplify link replacement --- kernel.d/post-install/99-void-usb | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/kernel.d/post-install/99-void-usb b/kernel.d/post-install/99-void-usb index 9d14895..350fc89 100644 --- a/kernel.d/post-install/99-void-usb +++ b/kernel.d/post-install/99-void-usb @@ -11,23 +11,6 @@ VERSION="$2" echo "Updating default kernel and initramfs symlinks..." -##################### -# Delete old symlinks -##################### -OLD_LINUX=/boot/vmlinu? -if [ ! -f "$OLD_LINUX" ]; then - # in cases where it’s a .gz or .xz or whatever - OLD_LINUX=$(find /boot -type l -name "vmlinu*" 2>/dev/null | sort | head -n1) -fi -[ -f "$OLD_LINUX" ] && rm "$OLD_LINUX" - -OLD_INITRAMFS=/boot/initramfs.img -if [ ! -f "$OLD_INITRAMFS" ]; then - # hope to find anything named initramfs or initrd - OLD_INITRAMFS=$(find /boot -type l -name "init*" 2>/dev/null | sort | head -n1) -fi -[ -f "$OLD_INITRAMFS" ] && rm "$OLD_INITRAMFS" - ##################### # Create new symlinks ##################### @@ -39,7 +22,7 @@ fi if grep -e ".gz$" -e ".xz$" -e ".bz$" -e ".bz2$" -e ".lzma$" -e ".lz$" -e ".img$" >/dev/null 2>&1 <<< "$NEW_LINUX_FILE"; then NEW_LINUX_SYMLINK="$NEW_LINUX_SYMLINK$(grep -o -e ".gz$" -e ".xz$" -e ".bz$" -e ".bz2$" -e ".lzma$" -e ".lz$" -e ".img$" 2>/dev/null <<< "$NEW_LINUX_FILE")" fi -ln -s "$NEW_LINUX_FILE" "/boot/$NEW_LINUX_SYMLINK" +ln -s -f "$NEW_LINUX_FILE" "/boot/$NEW_LINUX_SYMLINK" NEW_INITRAMFS_FILE="$(find /boot -name "init*$VERSION*" 2>/dev/null | sed 's|^/boot/||')" NEW_INITRAMFS_SYMLINK="initramfs" @@ -49,7 +32,7 @@ fi if grep -e ".gz$" -e ".xz$" -e ".bz$" -e ".bz2$" -e ".lzma$" -e ".lz$" -e ".img$" >/dev/null 2>&1 <<< "$NEW_INITRAMFS_FILE"; then NEW_INITRAMFS_SYMLINK="$NEW_INITRAMFS_SYMLINK$(grep -o -e ".gz$" -e ".xz$" -e ".bz$" -e ".bz2$" -e ".lzma$" -e ".lz$" -e ".img$" 2>/dev/null <<< "$NEW_INITRAMFS_FILE")" fi -ln -s "$NEW_INITRAMFS_FILE" "/boot/$NEW_INITRAMFS_SYMLINK" +ln -s -f "$NEW_INITRAMFS_FILE" "/boot/$NEW_INITRAMFS_SYMLINK" echo "Default kernel and initramfs are now: $NEW_LINUX_FILE, $NEW_INITRAMFS_FILE"