mirror of
git://slackware.nl/current.git
synced 2024-12-29 10:25:00 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
70 lines
2.6 KiB
Diff
70 lines
2.6 KiB
Diff
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) */
|
|
|
|
|