Skip to content

Prevent grep from matching comment #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brandon-pribula wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Prevent grep from matching comment #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
372a416
Fix: Remove exit statement. Fix typo
brandon-pribula Oct 27, 2024
f9fcff5
Prevent grep from matching comment in /etc/lilo.conf
brandon-pribula Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion files/post-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions files/slackpkg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand Down