[patch] Beta version of patch

lilo-mdp.patch (text/plain), 2.44 KB, created by Honza on 2005-08-30 16:01:53 UTC

diff -Naur old/device.c new/device.c
--- old/device.c	2005-02-22 21:22:29.000000000 +0100
+++ new/device.c	2005-08-31 00:53:34.000000000 +0200
@@ -905,7 +905,7 @@
 	    printf("pf_hard_disk_scan: (%d,%d) %s\n", major, minor, name);
 	}
 	
-	device = major<<8 | (minor&255);
+	device = MKDEV(major,minor);
 
 	Dev.delete = 0;
 	if (stat(name, &st) < 0) {
diff -Naur old/geometry.c new/geometry.c
--- old/geometry.c	2005-02-23 06:37:52.000000000 +0100
+++ new/geometry.c	2005-08-31 00:47:11.000000000 +0200
@@ -244,7 +244,7 @@
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /*  Cx   */
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  63,  0
 /*
   0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
 */
@@ -258,7 +258,7 @@
    if (
 /***   	major < sizeof(max_partno) &&	***/
    	(ret=max_partno[major])
-   					)  ret ^= 0xFFFF;
+   					)  ret ^= 0xFFFFFFFF;
    else ret = 0;
    
    return ret;
diff -Naur old/geometry.h new/geometry.h
--- old/geometry.h	2004-09-16 02:10:44.000000000 +0200
+++ new/geometry.h	2005-08-31 00:42:52.000000000 +0200
@@ -53,6 +53,12 @@
 #define FDGETPRM _IOR(2, 0x04, struct floppy_struct)
 #endif
 
+#include <sys/sysmacros.h>
+#ifdef __GLIBC_HAVE_LONG_LONG
+#define MAJOR(dev) major(dev)
+#define MINOR(dev) minor(dev)
+#define MKDEV(maj,min) makedev(maj,min)
+#else
 /* from <linux/kdev_t.h>  */
 /* These are for user-level "dev_t" */
 #define MINORBITS	8
@@ -61,6 +67,7 @@
 #define MAJOR(dev)	((unsigned int) ((dev) >> MINORBITS))
 #define MINOR(dev)	((unsigned int) ((dev) & MINORMASK))
 #define MKDEV(ma,mi)	(((ma) << MINORBITS) | (mi))
+#endif
 
 /*  from <linux/fs.h> */
 #define BMAP_IOCTL 1		/* obsolete - kept for compatibility */
diff -Naur old/lilo.h new/lilo.h
--- old/lilo.h	2005-01-30 21:07:15.000000000 +0100
+++ new/lilo.h	2005-08-31 00:49:59.000000000 +0200
@@ -182,7 +182,7 @@
 #define PART_ACT_ENT_OFF   0	/* offset in entry for active flag */
 #define PART_TYPE_ENT_OFF  4	/* offset in entry for partition type */
 
-#define P_MASK(x) ((~has_partitions(x))&0xFFFF)
+#define P_MASK(x) ((~has_partitions(x))&0xFFFFFFFF)
 #define D_MASK(x) (has_partitions(x))
 #define PART_MAX PARTITION_ENTRIES /* biggest primary partition number */
 #define PART_MAX_MAX	63	/* max. partition number (on IDE disks) */