diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-10-05 23:55:27 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-10-05 23:55:27 +0000 |
| commit | b0fb70b7e1c17c8711faa8a22915f0a40e4df64d (patch) | |
| tree | 912b8f8942fc14f30853973f682862446df6d726 /sys-apps/debianutils | |
| parent | ~amd64 - bug #66462 (Manifest recommit) (diff) | |
| download | gentoo-2-b0fb70b7e1c17c8711faa8a22915f0a40e4df64d.tar.gz gentoo-2-b0fb70b7e1c17c8711faa8a22915f0a40e4df64d.tar.bz2 gentoo-2-b0fb70b7e1c17c8711faa8a22915f0a40e4df64d.zip | |
accept grub-static too #58219
Diffstat (limited to 'sys-apps/debianutils')
| -rw-r--r-- | sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch b/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch index c47a2a20ad02..767473c31a69 100644 --- a/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch +++ b/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch @@ -12,7 +12,7 @@ diff -urN debianutils-1.16.7.old/installkernel debianutils-1.16.7/installkernel else --- debianutils-1.16.7.old/mkboot 2002-10-16 20:20:42.000000000 -0700 +++ debianutils-1.16.7/mkboot 2003-04-03 16:16:55.000000000 -0800 -@@ -14,7 +14,13 @@ +@@ -14,7 +14,18 @@ # check whether GRUB is installed grubcheck () { @@ -20,7 +20,12 @@ diff -urN debianutils-1.16.7.old/installkernel debianutils-1.16.7/installkernel + # Right way in Gentoo to check, but grub is in system profile, + # so rather check for lilo first.... + if [ -x /usr/bin/portageq ] ; then -+ portageq has_version / "sys-boot/grub" && return 0 || return 1 ++ if portageq has_version / "sys-boot/grub" ; then ++ return 0 ++ elif portageq has_version / "sys-boot/grub-static" ; then ++ return 0 ++ fi ++ return 1 + else + return 1 + fi |