diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-02-01 13:15:34 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-02-01 13:15:34 +0000 |
| commit | 102c7c6262499e49a9a6dc467d785ea4336f1617 (patch) | |
| tree | f0977610112a098be8a204e311552b91515cb00c /sys-fs | |
| parent | fix pkg-config output (diff) | |
| download | gentoo-2-102c7c6262499e49a9a6dc467d785ea4336f1617.tar.gz gentoo-2-102c7c6262499e49a9a6dc467d785ea4336f1617.tar.bz2 gentoo-2-102c7c6262499e49a9a6dc467d785ea4336f1617.zip | |
Updated patch to take SCSI disks into account.
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.34-kernel-2.6-fix.patch | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.34-kernel-2.6-fix.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.34-kernel-2.6-fix.patch index afb9c7a27f1e..2265db400c8b 100644 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.34-kernel-2.6-fix.patch +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.34-kernel-2.6-fix.patch @@ -1,19 +1,25 @@ -diff -X /usr/src/dontdiff -urN e2fsprogs-old/misc/util.c e2fsprogs-1.34/misc/util.c ---- e2fsprogs-old/misc/util.c Sat May 3 15:46:47 2003 -+++ e2fsprogs-1.34/misc/util.c Tue Sep 30 06:56:11 2003 -@@ -108,13 +108,8 @@ +diff -ruN e2fsprogs-1.33.orig/misc/util.c e2fsprogs-1.33/misc/util.c +--- e2fsprogs-1.33.orig/misc/util.c 2003-03-02 01:29:00.000000000 +0100 ++++ e2fsprogs-1.33/misc/util.c 2003-10-18 20:06:46.866581288 +0200 +@@ -108,8 +108,20 @@ #define MAJOR(dev) ((dev)>>8) #define MINOR(dev) ((dev) & 0xff) #endif --#ifndef SCSI_BLK_MAJOR ++ ++#ifndef SCSI_DISK_MAJOR ++#ifdef SCSI_DISK8_MAJOR ++#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \ ++ ((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR) || \ ++ ((M) >= SCSI_DISK8_MAJOR && (M) <= SCSI_DISK15_MAJOR)) ++#else ++#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \ ++ ((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR)) ++#endif ++#endif ++ + #ifndef SCSI_BLK_MAJOR -#define SCSI_BLK_MAJOR(M) ((M) == SCSI_DISK_MAJOR || (M) == SCSI_CDROM_MAJOR) --#endif -- if (((MAJOR(s.st_rdev) == HD_MAJOR && -- MINOR(s.st_rdev)%64 == 0) || -- (SCSI_BLK_MAJOR(MAJOR(s.st_rdev)) && -- MINOR(s.st_rdev)%16 == 0))) { -+ if (MAJOR(s.st_rdev) == HD_MAJOR && -+ MINOR(s.st_rdev)%64 == 0) { - printf(_("%s is entire device, not just one partition!\n"), - device); - proceed_question(); ++#define SCSI_BLK_MAJOR(M) (SCSI_DISK_MAJOR(M) || (M) == SCSI_CDROM_MAJOR) + #endif + if (((MAJOR(s.st_rdev) == HD_MAJOR && + MINOR(s.st_rdev)%64 == 0) || |