Bug#142481: workaround

[Eduard Bloch <edi@gmx.de>]

tags 142481 + patch
thanks

Another workaround that should work, but I am not able to test it yet.

Gruss/Regards,
Eduard.
-- 
'Und dann muß man den Computer herunterladen, sonst stürzt er ab.'
                                                 (Harald Schmidt)

Index: debian/changelog
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/debian/changelog,v
retrieving revision 1.1216
diff -u -r1.1216 changelog
--- debian/changelog	2002/04/13 01:55:11	1.1216
+++ debian/changelog	2002/04/13 13:44:23
@@ -7,6 +7,9 @@
     - changed the f6 boot message to show the keytimer option
     - German release notes updated
     - changed SUITE (dbootstrap_settings) to woody
+    - set -t auto as alternative to -t xfs. Our XFS detection may fail on
+      reinitialised ex-XFS partitions, which have rests of XFS in the first
+      sector. Closes: #142481
   * Guido Guenther
     - add myself to the maintainers file for MIPS
     - remove addinitrd source from boot-floppies - we have a mips-utils 
Index: utilities/dbootstrap/partition_config.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/partition_config.c,v
retrieving revision 1.165
diff -u -r1.165 partition_config.c
--- utilities/dbootstrap/partition_config.c	2002/04/11 15:46:04	1.165
+++ utilities/dbootstrap/partition_config.c	2002/04/13 13:44:24
@@ -794,8 +794,8 @@
 	if (verify_powerpc_mount(mount_point, "xfs"))
 	  return 1;
 #endif
-	INFOMSG("Mounting XFS partition %s on %s", partition->name, mount_point);
-	snprintf(prtbuf, sizeof(prtbuf), "mount -t xfs %s %s", partition->name, real_mount_point);
+	INFOMSG("Mounting XFS partition %s on %s, and trying auto on failure", partition->name, mount_point);
+	snprintf(prtbuf, sizeof(prtbuf), "mount -t xfs %s %s || mount -t auto %s %s", partition->name, real_mount_point, partition->name, real_mount_point);
 	status = execlog(prtbuf, LOG_INFO);
       }