From: Stelian Pop <stelian@popies.net>
Date: Thu, 31 Jan 2002 10:49:16 +0000 (+0000)
Subject: dump LABEL=/ fix.
X-Git-Tag: release_0_4b27~4
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=633963a251fb12a63e43a7f6f2391dc9507972a7;p=dump.git

dump LABEL=/ fix.
---

diff --git a/CHANGES b/CHANGES
index 0af096f..e6fc072 100644
--- 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 ???????????????)
 =====================================================================
@@ -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.
 
+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)
 =====================================================================
 
diff --git a/dump/main.c b/dump/main.c
index 6ac72ee..ee67172 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -41,7 +41,7 @@
 
 #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>
@@ -531,7 +531,8 @@ main(int argc, char *argv[])
 	 */
 	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