summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Kinard <kumba@gentoo.org>2021-06-06 16:59:08 -0400
committerJoshua Kinard <kumba@gentoo.org>2021-06-06 16:59:27 -0400
commit41509f2380849f4765727f2d22b048ddfb81a623 (patch)
treebfcbca808c629688450b283354ff43d3c15307b5 /sys-boot/lilo
parentmedia-plugins/x42-avldrums: added missing dep (diff)
downloadgentoo-41509f2380849f4765727f2d22b048ddfb81a623.tar.gz
gentoo-41509f2380849f4765727f2d22b048ddfb81a623.tar.bz2
gentoo-41509f2380849f4765727f2d22b048ddfb81a623.zip
sys-boot/lilo: Fix bugs #377427 and #473620
Remove 'keepdir /boot' from src_install to address #377427 and update the example lilo.conf in FILESDIR to reference 'sda' instead of 'hda' (name for older PATA drives) to fix #473620. Closes: https://bugs.gentoo.org/377427 Closes: https://bugs.gentoo.org/473620 Signed-off-by: Joshua Kinard <kumba@gentoo.org> Package-Manager: Portage-3.0.19, Repoman-3.0.3
Diffstat (limited to 'sys-boot/lilo')
-rw-r--r--sys-boot/lilo/files/lilo.conf8
-rw-r--r--sys-boot/lilo/lilo-24.2.ebuild1
2 files changed, 4 insertions, 5 deletions
diff --git a/sys-boot/lilo/files/lilo.conf b/sys-boot/lilo/files/lilo.conf
index 3848f779029b..a65ae24252dc 100644
--- a/sys-boot/lilo/files/lilo.conf
+++ b/sys-boot/lilo/files/lilo.conf
@@ -12,7 +12,7 @@ lba32
#linear
# MBR to install LILO to:
-boot = /dev/hda
+boot = /dev/sda
map = /boot/.map
# If you are having problems booting from a hardware raid-array
@@ -51,7 +51,7 @@ vga = normal
# Linux bootable partition config begins
#
image = /boot/bzImage
- root = /dev/hda3
+ root = /dev/sda3
#root = /devices/discs/disc0/part3
label = Gentoo
read-only # read-only for checking
@@ -62,10 +62,10 @@ image = /boot/bzImage
#
# DOS bootable partition config begins
#
-other = /dev/hda1
+other = /dev/sda1
#other = /devices/discs/disc0/part1
label = Windows
- table = /dev/hda
+ table = /dev/sda
#
# DOS bootable partition config ends
#
diff --git a/sys-boot/lilo/lilo-24.2.ebuild b/sys-boot/lilo/lilo-24.2.ebuild
index ae703abe60db..9ae96a087bd0 100644
--- a/sys-boot/lilo/lilo-24.2.ebuild
+++ b/sys-boot/lilo/lilo-24.2.ebuild
@@ -70,7 +70,6 @@ src_compile() {
}
src_install() {
- keepdir /boot
emake DESTDIR="${D}" install
if use !minimal; then