diff options
| author |   Seemant Kulleen <seemant@gentoo.org> | 2003-04-03 22:52:53 +0000 |
|---|---|---|
| committer | Seemant Kulleen <seemant@gentoo.org> | 2003-04-03 22:52:53 +0000 |
| commit | f2ba87803b7234ee5ec399de3b17e0aaf63ef376 (patch) | |
| tree | 132606debf3037db56367a80cf26d4c51eb40150 /sys-apps/debianutils/files | |
| parent | initial import of Oort Gnus (diff) | |
| download | historical-f2ba87803b7234ee5ec399de3b17e0aaf63ef376.tar.gz historical-f2ba87803b7234ee5ec399de3b17e0aaf63ef376.tar.bz2 historical-f2ba87803b7234ee5ec399de3b17e0aaf63ef376.zip | |
Removed crusty
Diffstat (limited to 'sys-apps/debianutils/files')
| -rw-r--r-- | sys-apps/debianutils/files/debianutils-1.16.3-Makefile-gentoo.diff | 8 | ||||
| -rw-r--r-- | sys-apps/debianutils/files/debianutils-1.16.3-gentoo.patch | 73 |
2 files changed, 0 insertions, 81 deletions
diff --git a/sys-apps/debianutils/files/debianutils-1.16.3-Makefile-gentoo.diff b/sys-apps/debianutils/files/debianutils-1.16.3-Makefile-gentoo.diff deleted file mode 100644 index e130532b5c39..000000000000 --- a/sys-apps/debianutils/files/debianutils-1.16.3-Makefile-gentoo.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- Makefile.orig Tue Feb 27 01:13:51 2001 -+++ Makefile Tue Feb 27 16:41:17 2001 -@@ -1,4 +1,4 @@ --CFLAGS=-O2 -g -Wall -+CFLAGS+=-Wall - TARGETS=mktemp readlink run-parts tempfile - - all: $(TARGETS) diff --git a/sys-apps/debianutils/files/debianutils-1.16.3-gentoo.patch b/sys-apps/debianutils/files/debianutils-1.16.3-gentoo.patch deleted file mode 100644 index 221286455ddb..000000000000 --- a/sys-apps/debianutils/files/debianutils-1.16.3-gentoo.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -urN debianutils-1.16.3/installkernel debianutils-1.16.3.azarah/installkernel ---- debianutils-1.16.3/installkernel 2002-06-13 14:22:33.000000000 +0200 -+++ debianutils-1.16.3.azarah/installkernel 2002-09-26 23:07:52.000000000 +0200 -@@ -33,7 +33,7 @@ - cat "$2" > "$dir/$1-$ver" - - if [ -f "$dir/$1" ] ; then -- if [ -L "$dir/$1" -a $(ls -l "$dir/$1" | awk '{print $11}') \ -+ if [ -L "$dir/$1" -a "$(ls -l "$dir/$1" | awk '{print $11}')" \ - = "$1-$ver" ] ; then - ln -sf "$1-$ver.old" "$dir/$1.old" - else -diff -urN debianutils-1.16.3/mkboot debianutils-1.16.3.azarah/mkboot ---- debianutils-1.16.3/mkboot 2002-02-19 02:03:17.000000000 +0200 -+++ debianutils-1.16.3.azarah/mkboot 2002-09-26 23:10:00.000000000 +0200 -@@ -14,7 +14,13 @@ - - # check whether GRUB is installed - grubcheck () { -- [ $(dpkg -s grub | grep -i ^status: | cut -d ' ' -f 4) = "installed" ] -+ # Right way in Gentoo to check, but grub is in system profile, -+ # so rather check for lilo first.... -+ if [ -x /usr/bin/qpkg ] ; then -+ [ "$(qpkg -nc sys-apps/grub)" = "sys-apps/grub *" ] -+ else -+ return 1 -+ fi - } - - # check whether LILO is installed -@@ -94,7 +100,7 @@ - fi - - boottype="lilo" -- if [ $(whoami) != root ] ; then -+ if [ "$(whoami)" != root ] ; then - echo "Since you don't have root permissions, I can't put LILO on the diskette." - echo "I will make a non-LILO diskette instead, but it won't be as useful. You" - echo "can hit <Ctrl-C> to cancel." -@@ -144,6 +150,16 @@ - echo "either make a bootable floppy diskette, re-run LILO, or have GRUB" - echo "installed." - -+ lilocheck -+ if [ $? -eq 0 ] ; then -+ echo -en "\nShould I run /sbin/lilo? (y/n) " -+ read input -+ if [ "$input" = "y" ] ; then -+ /sbin/lilo && exit 0 -+ echo "There was a problem running /sbin/lilo." -+ fi -+ fi -+ - grubcheck - if [ $? -eq 0 ] ; then - echo -e "\nGRUB is installed. To automatically switch to new kernels, point your" -@@ -151,16 +167,6 @@ - exit 0 - fi - -- lilocheck -- if [ $? -eq 0 ] ; then -- echo -en "\nShould I run /sbin/lilo? (y/n) " -- read input -- if [ "$input" = "y" ] ; then -- /sbin/lilo && exit 0 -- echo "There was a problem running /sbin/lilo." -- fi -- fi -- - echo -en "\nShould I make a bootdisk? (y/n) " - read input - if [ "$input" = "y" ] ; then |