From 372a416c22f57fdc6d6b0cac91b56d020b4eaa58 Mon Sep 17 00:00:00 2001 From: Brandon Pribula Date: Sat, 26 Oct 2024 17:24:49 -0700 Subject: [PATCH 1/2] Fix: Remove exit statement. Fix typo --- files/slackpkg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/files/slackpkg b/files/slackpkg index cc95bb0..ff318b9 100644 --- a/files/slackpkg +++ b/files/slackpkg @@ -452,10 +452,9 @@ case "$CMD" in FOUND=$(echo $SHOWLIST | tr -s ' ' "\n" | grep "slackpkg-[0-9]") if [ "$FOUND" != "" ]; then getpkg $FOUND upgradepkg Upgrading - echo -e "slackpkg was upgraded - you will need start the upgrade process again...\n" + echo -e "slackpkg was upgraded - you will need to start the upgrade process again...\n" EXIT_CODE=50 cleanup - exit ${EXIT_CODE} fi for i in pkgtools aaa_glibc-solibs glibc-solibs aaa_libraries aaa_elflibs readline sed; do FOUND="" From f9fcff5b25af01e00af56b6860360a2adf8e00ab Mon Sep 17 00:00:00 2001 From: Brandon Pribula Date: Sat, 26 Oct 2024 23:35:39 -0700 Subject: [PATCH 2/2] Prevent grep from matching comment in /etc/lilo.conf --- files/post-functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/post-functions.sh b/files/post-functions.sh index 0339e00..ac39c64 100644 --- a/files/post-functions.sh +++ b/files/post-functions.sh @@ -326,7 +326,7 @@ for you to deal with later" lookkernel() { NEWKERNELMD5=$(md5sum /boot/vmlinuz 2>/dev/null) if [ "$KERNELMD5" != "$NEWKERNELMD5" ]; then - if [ -x /sbin/lilo ] && [ -r /etc/lilo.conf ] && grep -q initrd /etc/lilo.conf ; then + if [ -x /sbin/lilo ] && [ -r /etc/lilo.conf ] && grep -q '^[[:space:]]*initrd=' /etc/lilo.conf ; then echo -e "\n Your kernel image was updated, and your /etc/lilo.conf indicates the use of an initrd for at least one of your kernels. Be sure to