diff -Naur debianutils-2.8.1-orig/installkernel debianutils-2.8.1/installkernel --- debianutils-2.8.1-orig/installkernel 2004-03-30 22:59:39.000000000 -0500 +++ debianutils-2.8.1/installkernel 2004-04-27 01:21:34.000000000 -0400 @@ -34,7 +34,7 @@ if test -f "$dir/$1" ; then if test -L "$dir/$1" && - [ "$(readlink -f ${dir}/${1})" = "${dir}/${1}-${ver}" ]; then + [ "$(readlink -f "${dir}/${1}")" = "${dir}/${1}-${ver}" ]; then ln -sf "$1-$ver.old" "$dir/$1.old" else mv "$dir/$1" "$dir/$1.old" diff -Naur debianutils-2.8.1-orig/mkboot debianutils-2.8.1/mkboot --- debianutils-2.8.1-orig/mkboot 2004-02-29 10:04:17.000000000 -0500 +++ debianutils-2.8.1/mkboot 2004-04-27 01:18:08.000000000 -0400 @@ -40,7 +40,7 @@ # check whether LILO is installed lilocheck () { printf "\nChecking for LILO..." - if [ $(whoami) != root ] ; then + if [ "$(whoami)" != root ] ; then echo "Only root can check for LILO" return 1; fi @@ -330,12 +330,7 @@ fi fi - if grubcheck; then - printf "\nGRUB is installed. To automatically switch to new kernels, point your\n" - echo "default entry in menu.lst to $1" - exit 0 - fi - + # grub is in system profile, so rather check for lilo first if lilocheck; then liloOK=y printf "\nShould I run /sbin/lilo? (y/N) " @@ -347,6 +342,12 @@ fi fi + if grubcheck; then + printf "\nGRUB is installed. To automatically switch to new kernels, point your\n" + echo "default entry in menu.lst to $1" + exit 0 + fi + printf "\nShould I make a bootdisk? (y/N) " read input if [ "$input" = "y" ] ; then diff -Naur debianutils-2.8.1-orig/run-parts.c debianutils-2.8.1/run-parts.c --- debianutils-2.8.1-orig/run-parts.c 2004-03-24 15:20:31.000000000 -0500 +++ debianutils-2.8.1/run-parts.c 2004-04-27 01:25:37.000000000 -0400 @@ -130,7 +130,7 @@ if (regcomp (&hierre, "^_?([a-z0-9_.]+-)+[a-z0-9]+$", REG_EXTENDED | REG_NOSUB) - || regcomp(&excsre, "^[a-z0-9-].*dpkg-(old|dist)$", + || regcomp(&excsre, "^._cfg[0-9]{4}_.*$", REG_EXTENDED | REG_NOSUB) || regcomp(&tradre, "^[a-z0-9][a-z0-9-]*$", REG_NOSUB)) { error("regex failure");