# HG changeset patch
# User Stanislas Leduc <shann@slitaz.org>
# Date 1705428484 0
# Node ID e6c086aad08f289e5da32425b162743f1406e475
# Parent  adb82ce06cee9ba040eb74495b6b666b9336cddd
Add lilo patch and example config

diff -r adb82ce06cee -r e6c086aad08f lilo/receipt
--- a/lilo/receipt	Mon Jan 15 22:12:34 2024 +0000
+++ b/lilo/receipt	Tue Jan 16 18:08:04 2024 +0000
@@ -34,5 +34,22 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
+	mkdir -p $fs/usr/share/examples/lilo
 	cp -a $install/sbin $fs
+	cp $stuff/lilo.conf $fs/usr/share/examples/lilo
 }
+
+post_install()
+{
+        cat <<EOT
+
+# Copy example configuration file to /etc:
+cp /usr/share/examples/lilo/lilo.conf /etc/lilo.conf
+
+# To modify default configuration, edit
+/etc/lilo.conf
+
+# To install lilo to MBR on device sda enter:                             
+lilo                                            
+EOT 
+}
diff -r adb82ce06cee -r e6c086aad08f lilo/stuff/lilo.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lilo/stuff/lilo.conf	Tue Jan 16 18:08:04 2024 +0000
@@ -0,0 +1,10 @@
+boot=/dev/sda
+prompt
+timeout = 10
+compact
+vga = normal
+lock
+image = /boot/vmlinuz-4.19.298-slitaz
+	label = "SliTaz"
+	root = /dev/sda1
+	read-only
diff -r adb82ce06cee -r e6c086aad08f lilo/stuff/lilo.ignore.usable.memory.above.4G.diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lilo/stuff/lilo.ignore.usable.memory.above.4G.diff	Tue Jan 16 18:08:04 2024 +0000
@@ -0,0 +1,42 @@
+From Sl4ck3ver on LQ:
+http://www.linuxquestions.org/questions/slackware-14/[patch]-found-a-nasty-lilo-bug-with-a-2-line-fix-for-14-2-a-4175577969/
+
+Every BIOS-e820 entry contains start and size of the area as 64-bit value
+and is shifted right 10 bits (1024) with "shrd" while searching for the
+largest "usable" memory range entry.
+
+
+Finally the found values are converted back into real addresses by shifting
+left 10 bits...
+
+BUT this is done the wrong only using a 32-bit register so the high dword is lost!!!
+
+0x000000027fffffff gets 0x000000007fffffff :-(
+
+Every EXISTING system which happens to work fine just happens to
+have an entry which just contains "usable" memory at that address.
+Often in the form of an entry like:
+
+BIOS-e820: [mem 0x0000000000100000-0x00000000fxxxxxxx] usable
+
+Virtually all systems have "usable" memory at that position, so until
+now this bug was not noticed!
+
+
+HERE IS THE FIX, A 2-LINER:
+===========================
+
+Ignore any usable memory range not starting below 4GB and
+so avoid the truncation, really just a work around :-)
+
+--- ./src/second.S.orig	2016-04-21 15:12:57.155456806 -0500
++++ ./src/second.S	2016-04-21 15:15:08.918466313 -0500
+@@ -2975,6 +2975,8 @@
+ 	shrd	memmap+8,eax,#10 ; convert to 1k
+ 	cmp	dword memmap,#1024	; below 1M
+ 	jb	e8go2		; below 1M, no interest
++	cmp	dword memmap,#4*1024*1024	; above 4G
++	jae	e8go2		; above 4G, no interest
+ 	cmp	esi,memmap+8	; check size
+ 	ja	e8go2		; want largest
+ 	mov	edx,memmap	; start (in 1k)
diff -r adb82ce06cee -r e6c086aad08f lilo/stuff/lilo.nvme.support.diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lilo/stuff/lilo.nvme.support.diff	Tue Jan 16 18:08:04 2024 +0000
@@ -0,0 +1,70 @@
+diff -Naru lilo-24.2/src/common.h lilo-24.2.new/src/common.h
+--- lilo-24.2/src/common.h	2015-11-21 23:50:23.000000000 +0000
++++ lilo-24.2.new/src/common.h	2018-02-15 15:13:17.411968439 +0000
+@@ -386,7 +386,7 @@
+ extern FILE *errstd;
+ extern FILE *pp_fd;
+ extern char *identify;	/* in identify.c */
+-extern int dm_major_list[16];
++extern int dm_major_list[32];
+ extern int dm_major_nr;
+ 
+ #define crc(a,b) (~crc32((a),(b),CRC_POLY1))
+diff -Naru lilo-24.2/src/geometry.c lilo-24.2.new/src/geometry.c
+--- lilo-24.2/src/geometry.c	2015-11-21 23:50:18.000000000 +0000
++++ lilo-24.2.new/src/geometry.c	2018-02-15 16:10:25.844149725 +0000
+@@ -84,8 +84,9 @@
+ int dm_version_nr = 0;
+ #endif
+ 
+-int dm_major_list[16];
++int dm_major_list[32]; /* increased from 16 to allow for nvme disks  */
+ int dm_major_nr;
++int nvme_pr = 0; /* set to none zero after geo_init if nvme disk present */
+ 
+ #ifdef LCF_LVM
+ struct lv_bmap {
+@@ -200,6 +201,9 @@
+ 
+     while(fgets(line, (sizeof line)-1, file)) {
+ 	if (sscanf(line, "%d %31s\n", &major, major_name) != 2) continue;
++	if (strcmp(major_name, "nvme") !=0) {  /* set if nvme drive is present */
++		nvme_pr=-1;
++	}
+ 	if (strcmp(major_name, "device-mapper") != 0) continue;
+ 	dm_major_list[dm_major_nr] = major;
+ 	if (verbose >= 3) {
+@@ -708,6 +712,22 @@
+ 	    geo->start = hdprm.start;
+ 	    break;
+ 	case MAJOR_SATA1:
++	    /* check for nvme device and assume boot/this device is nvme if present */
++	    if (nvme_pr != 0) {
++	    geo->device = 0x80 + last_dev(MAJOR_IDE,64) + (MINOR(device) >> 4);
++	    if (!get_all) break;
++	    if (ioctl(fd,HDIO_GETGEO,&hdprm) < 0)
++		die("geo_query_dev HDIO_GETGEO (dev 0x%04x): %s",device,
++		  strerror(errno));
++	    if (all && !hdprm.sectors)
++		die("HDIO_REQ not supported for your NVME controller. Please "
++		  "use a DISK section");
++	    geo->heads = hdprm.heads;
++	    geo->cylinders = hdprm.cylinders;
++	    geo->sectors = hdprm.sectors;
++	    geo->start = hdprm.start;
++	    break;
++    	}
+ 	case MAJOR_SATA2:
+ 		printf("WARNING: SATA partition in the high region (>15):\n");
+ 		printf("LILO needs the kernel in one of the first 15 SATA partitions. If \n");
+diff -Naru lilo-24.2/src/lilo.h lilo-24.2.new/src/lilo.h
+--- lilo-24.2/src/lilo.h	2015-11-21 23:50:20.000000000 +0000
++++ lilo-24.2.new/src/lilo.h	2018-02-15 15:27:35.647786827 +0000
+@@ -245,6 +245,7 @@
+ 
+ /* high partitions (>15) on SATA hard disks */
+ #define MAJOR_SATA1    259    /* high SATA disk partitions (Block Extended Major) */
++                              /* also used by kernel for nvme disks */
+ #define MAJOR_SATA2    260    /* high SATA disk partitions (Block Extended Major) (obsolete) */
+ 
+