2001-02-28 Hans Petter Jansson <hpj@ximian.com>XST_0_3_0

* disks-conf.in: Don't touch UUID= either.

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index bc45580..214256f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-28  Hans Petter Jansson  <hpj@ximian.com>
+
+	* disks-conf.in (read_fstab, write_fstab): Don't touch UUID= either.
+
 2001-02-28  Arturo Espinosa  <arturo@ximian.com>
 
 	* file.pl.in (xst_open_write_from_names): old criterion was preventing
diff --git a/disks-conf.in b/disks-conf.in
index 409e627..9b3ee75 100755
--- a/disks-conf.in
+++ b/disks-conf.in
@@ -284,7 +284,7 @@ sub read_fstab
     @line = split(/[ \n\r\t]+/, $_);
 
     if ($line[0] eq "") { shift @line; }
-    if ($line[0] eq "" || $line[0] =~ /$LABEL=.*/) { next; }
+    if ($line[0] eq "" || $line[0] =~ /$LABEL=.*/ || $line[0] =~ /$UUID=.*/) { next; }
     if (&xst_ignore_line($line[0])) { next; }
     ($device, $point, $fs, $options, $dump, $check) = @line;
 
@@ -331,7 +331,7 @@ sub write_fstab
     @line = split(/[ \n\r\t]+/, $_);
 
     if ($line[0] eq "") { shift @line; }
-    if ($line[0] eq "" || $line[0] =~ /$LABEL=.*/) { print OUTFILE; next; }
+    if ($line[0] eq "" || $line[0] =~ /$LABEL=.*/ || $line[0] =~ /$UUID=.*/) { print OUTFILE; next; }
     if (&xst_ignore_line($line[0])) { print OUTFILE; next; }
     ($device, $point, $fs, $options, $dump, $check) = @line;