[Fai-commit] r5440 - people/michael/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2009-07-19 14:53:12 +0000 (Sun, 19 Jul 2009)
New Revision: 5440

Removed:
   people/michael/experimental/patches/setup-storage_udevsettle
Modified:
   people/michael/experimental/patches/series
Log:
moved setup-storage_udevsettle into trunk


Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2009-07-19 14:49:39 UTC (rev 5439)
+++ people/michael/experimental/patches/series	2009-07-19 14:53:12 UTC (rev 5440)
@@ -10,7 +10,6 @@
 setup-storage_full-crypto-support
 setup-storage_missing-raid-devs
 setup-storage_raid-preserve-entry-missing
-setup-storage_udevsettle
 bugfix-532321
 setup-storage_raid10
 setup-storage_better-error-msgs

Deleted: people/michael/experimental/patches/setup-storage_udevsettle
===================================================================
--- people/michael/experimental/patches/setup-storage_udevsettle	2009-07-19 14:49:39 UTC (rev 5439)
+++ people/michael/experimental/patches/setup-storage_udevsettle	2009-07-19 14:53:12 UTC (rev 5440)
@@ -1,58 +0,0 @@
-2009-06-13  Michael Tautschnig  <mt at debian.org>
-
-	* setup-storage, setup-storage/Exec.pm: auto-detect a proper way to tell udev
-		to settle (udevsettle is used in etch, udevadm settle for sid; thanks
-		matrix.systems at matrix.msu.edu for a first patch). (closes: #530656)
-Index: trunk/bin/setup-storage
-===================================================================
---- trunk.orig/bin/setup-storage
-+++ trunk/bin/setup-storage	
-@@ -177,11 +177,15 @@
- }
- 
- # run the commands (if $FAI::no_dry_run is set)
-+# first find the proper way to tell udev to settle
-+$FAI::udev_settle = "udevadm settle --timeout=10" if (&FAI::in_path("udevadm"));
-+$FAI::udev_settle = "udevsettle --timeout=10" if (&FAI::in_path("udevsettle"));
-+defined($FAI::udev_settle) or die "Failed to find determine a proper way to tell udev to settle; is udev installed?";
- &FAI::execute_with_udevsettle($FAI::commands{$_}{cmd}) foreach (&numsort(keys %FAI::commands));
- 
- # generate the proposed fstab contents
- # wait for udev to set up all devices
--`udevsettle --timeout=10`;
-+&FAI::execute_with_udevsettle("true");
- my @fstab = &FAI::generate_fstab(\%FAI::configs);
- 
- # print fstab
-Index: trunk/lib/setup-storage/Init.pm
-===================================================================
---- trunk.orig/lib/setup-storage/Init.pm
-+++ trunk/lib/setup-storage/Init.pm	
-@@ -48,6 +48,13 @@
- 
- ################################################################################
- #
-+# @brief The command to tell udev to settle (udevsettle or udevadm settle)
-+#
-+################################################################################
-+$FAI::udev_settle = undef;
-+
-+################################################################################
-+#
- # @brief The lists of disks of the system
- #
- ################################################################################
-Index: trunk/lib/setup-storage/Exec.pm
-===================================================================
---- trunk.orig/lib/setup-storage/Exec.pm
-+++ trunk/lib/setup-storage/Exec.pm	
-@@ -246,7 +246,8 @@
- ################################################################################
- sub execute_with_udevsettle {
-   my ($command, $stdout, $stderr) = @_;
--  return &execute_command("udevsettle --timeout=10 && $command", $stdout,
-+  defined ($FAI::udev_settle) or &FAI::internal_error("udev settle command not defined");
-+  return &execute_command("$FAI::udev_settle && $command", $stdout,
-     $stderr);
- }
-