summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-10-06 00:15:33 +0000
committerMike Frysinger <vapier@gentoo.org>2004-10-06 00:15:33 +0000
commit28543c63e3cc85be7457982af8a43019604920f1 (patch)
tree63994b6cac705870629b7c6a681cbe2c1ced6ec8 /sys-apps
parentcall mkboot with full path in case /usr/sbin isnt in $PATH #54056 (Manifest r... (diff)
downloadgentoo-2-28543c63e3cc85be7457982af8a43019604920f1.tar.gz
gentoo-2-28543c63e3cc85be7457982af8a43019604920f1.tar.bz2
gentoo-2-28543c63e3cc85be7457982af8a43019604920f1.zip
look for /boot/vmlinuz instead of /vmlinuz #63080
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/debianutils/debianutils-1.16.7-r4.ebuild8
-rw-r--r--sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch11
2 files changed, 15 insertions, 4 deletions
diff --git a/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild b/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild
index a146d0194bbe..74e0763c37b8 100644
--- a/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild
+++ b/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild,v 1.12 2004/09/16 02:19:55 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild,v 1.13 2004/10/06 00:15:33 vapier Exp $
inherit eutils
@@ -53,15 +53,15 @@ src_install() {
insopts -m755
exeinto /usr/sbin
doexe savelog
- dosbin installkernel
+ dosbin installkernel || die "installkernel"
into /usr
- dosbin mkboot
+ dosbin mkboot || die "mkboot"
into /usr
doman mktemp.1 tempfile.1 run-parts.8 savelog.8 \
installkernel.8 mkboot.8
cd debian
- dodoc changelog control copyright
+ dodoc changelog control
fi
}
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 2962fa2d8ed5..a003edfe201e 100644
--- a/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch
+++ b/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch
@@ -38,6 +38,15 @@ diff -urN debianutils-1.16.7.old/installkernel debianutils-1.16.7/installkernel
}
# check whether LILO is installed
+@@ -90,7 +90,7 @@
+
+ # make a boot disk
+ makedisk () {
+- kernel=${1:-/vmlinuz}
++ kernel=${1:-/boot/vmlinuz}
+ if [ ! -r $kernel ] ; then
+ echo "Error: Can't read $kernel."
+ exit 1
@@ -96,7 +102,7 @@
fi
@@ -93,3 +102,5 @@ diff -urN debianutils-1.16.7.old/installkernel debianutils-1.16.7/installkernel
}
+--- /usr/sbin/mkboot.orig 2004-10-05 20:12:50.198385480 -0400
++++ /usr/sbin/mkboot 2004-10-05 20:13:29.477414160 -0400