dump LABEL=/ fix.

diff --git a/CHANGES b/CHANGES
index 0af096f4bb334d9f2ed1b678646df9cb9384c837..e6fc0722f5aa640b4d32454bc4e27372642f4d93 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.159 2002/01/31 10:25:55 stelian Exp $
+$Id: CHANGES,v 1.160 2002/01/31 10:49:16 stelian Exp $

 
 Changes between versions 0.4b26 and 0.4b27 (released ???????????????)
 =====================================================================
 
 Changes between versions 0.4b26 and 0.4b27 (released ???????????????)
 =====================================================================


@@ -32,6 +32,10 @@ Changes between versions 0.4b26 and 0.4b27 (released ???????????????)
 7.     Small fix in restore making it able to read some (broken ?)
        Solaris ufsdump tapes.
 
 7.     Small fix in restore making it able to read some (broken ?)
        Solaris ufsdump tapes.
 

+8.     Fixed dump to correctly recognise the root filesystem when using
+       ext2 disk labels (LABEL=/). Thanks to John Yu <jky@it.bu.edu>
+       for reporting this bug.
+

 Changes between versions 0.4b25 and 0.4b26 (released January 7, 2002)
 =====================================================================
 
 Changes between versions 0.4b25 and 0.4b26 (released January 7, 2002)
 =====================================================================
 

diff --git a/dump/main.c b/dump/main.c
index 6ac72ee017d582191979c578a481bfc04d4b253b..ee6717272dc5dd661455eb7b7075f1472278d73a 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: main.c,v 1.68 2002/01/25 15:08:59 stelian Exp $";
+       "$Id: main.c,v 1.69 2002/01/31 10:49:17 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -531,7 +531,8 @@ main(int argc, char *argv[])
         */
        i = strlen(diskparam) - 1;
        if (i > 1 && diskparam[i] == '/')
         */
        i = strlen(diskparam) - 1;
        if (i > 1 && diskparam[i] == '/')

-               diskparam[i] = '\0';
+               if (!(i == 6 && !strcmp(diskparam, "LABEL=/")))
+                       diskparam[i] = '\0';

 
        disk = get_device_name(diskparam);
        if (!disk) {            /* null means the disk is some form
 
        disk = get_device_name(diskparam);
        if (!disk) {            /* null means the disk is some form