diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
| commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
| tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /sys-boot/lilo/files | |
| parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) | |
gentoo resync : 15.06.2021
Diffstat (limited to 'sys-boot/lilo/files')
| -rw-r--r-- | sys-boot/lilo/files/lilo-24.x-check-for-__GLIBC__.patch | 18 | ||||
| -rw-r--r-- | sys-boot/lilo/files/lilo.conf | 8 |
2 files changed, 22 insertions, 4 deletions
diff --git a/sys-boot/lilo/files/lilo-24.x-check-for-__GLIBC__.patch b/sys-boot/lilo/files/lilo-24.x-check-for-__GLIBC__.patch new file mode 100644 index 000000000000..be3443629cfa --- /dev/null +++ b/sys-boot/lilo/files/lilo-24.x-check-for-__GLIBC__.patch @@ -0,0 +1,18 @@ +diff -Naurp lilo-24.2.orig/src/lilo.c lilo-24.2/src/lilo.c +--- lilo-24.2.orig/src/lilo.c 2021-06-06 15:53:52.389730145 -0400 ++++ lilo-24.2/src/lilo.c 2021-06-06 15:53:28.309159571 -0400 +@@ -182,7 +182,14 @@ extern int has_partitions_beta(dev_t dev + printf("Without"); + #endif + printf(" device-mapper\n"); ++#ifdef __GLIBC__ ++ /* ++ * __GLIBC__ is defined in features.h, which should be pulled ++ * in by stdio.h, but this is not guaranteed nor apparently ++ * documented anywhere. ++ */ + printf("\nglibc version %d.%d\n", __GLIBC__, __GLIBC_MINOR__); ++#endif + printf("Kernel Headers included from %d.%d.%d\n", + LINUX_VERSION_CODE>>16, + LINUX_VERSION_CODE>>8 & 255, 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 # |