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

[Michael Tautschnig]

Author: mt
Date: 2009-04-28 07:30:10 +0000 (Tue, 28 Apr 2009)
New Revision: 5378

Removed:
   people/michael/experimental/patches/bugfix-task_confdir
Modified:
   people/michael/experimental/patches/bugfix-524347
   people/michael/experimental/patches/series
   people/michael/experimental/patches/setup-storage_missing-raid-devs
Log:
- removed task_confdir patch as it went into 3.2.19 already
- updated and improved bugfixes (now also closing #525138)


Modified: people/michael/experimental/patches/bugfix-524347
===================================================================
--- people/michael/experimental/patches/bugfix-524347	2009-04-22 11:46:48 UTC (rev 5377)
+++ people/michael/experimental/patches/bugfix-524347	2009-04-28 07:30:10 UTC (rev 5378)
@@ -108,7 +108,7 @@
 ===================================================================
 --- trunk.orig/lib/subroutines-linux
 +++ trunk/lib/subroutines-linux	
-@@ -270,7 +270,7 @@
+@@ -271,7 +271,7 @@
  
      if [ $do_init_tasks -eq 1 ] ; then
  	# show some local information

Deleted: people/michael/experimental/patches/bugfix-task_confdir
===================================================================
--- people/michael/experimental/patches/bugfix-task_confdir	2009-04-22 11:46:48 UTC (rev 5377)
+++ people/michael/experimental/patches/bugfix-task_confdir	2009-04-28 07:30:10 UTC (rev 5378)
@@ -1,28 +0,0 @@
-2009-04-22  Michael Tautschnig  <mt at debian.org>
-
-	* subroutines-linux: get-config-dir was never run if -z $monserver, which may
-		be the case when no DHCP was done (dirinstall, softupdates, or install using
-		fixed IP); problem was introduced by patch in r5338.
-Index: trunk/lib/subroutines-linux
-===================================================================
---- trunk.orig/lib/subroutines-linux
-+++ trunk/lib/subroutines-linux	
-@@ -79,8 +79,8 @@
-     [ -z "$monserver" ] && monserver=$SERVER
-     if [ -z "$monserver" ]; then
- 	echo "No monitor daemon defined."
--	return
--    fi
-+  faimond=0
-+    else
-     faimond=1
-     sendhostname=$HOSTNAME # save current hostname
-     if sendmon check; then
-@@ -90,6 +90,7 @@
- 	faimond=0
- 	echo "Can't connect to monserver on $monserver port 4711. Monitoring disabled."
-     fi
-+    fi
- 
-     get-config-dir || {
- 	echo "Problems accessing the config space."

Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2009-04-22 11:46:48 UTC (rev 5377)
+++ people/michael/experimental/patches/series	2009-04-28 07:30:10 UTC (rev 5378)
@@ -1,4 +1,3 @@
-bugfix-task_confdir
 logtail
 grub-pc
 bugfix-506459

Modified: people/michael/experimental/patches/setup-storage_missing-raid-devs
===================================================================
--- people/michael/experimental/patches/setup-storage_missing-raid-devs	2009-04-22 11:46:48 UTC (rev 5377)
+++ people/michael/experimental/patches/setup-storage_missing-raid-devs	2009-04-28 07:30:10 UTC (rev 5378)
@@ -1,9 +1,10 @@
-2009-04-10  Michael Tautschnig  <mt at debian.org>
+2009-04-28  Michael Tautschnig  <mt at debian.org>
 
 	* setup-storage/Parser.pm: $2 doesn't refer to the original expression
 		anymore, store earlier $2 as $opts.
 	* setup-storage/Sizes.pm: Properly deal with missing (as in RAID specs) or
-		non-existing (user error) devices in estimate_size.
+		non-existing (user error) devices in estimate_size; don't do stupid divide
+		by 2 in RAID1 setup. (closes: #525138)
 Index: trunk/lib/setup-storage/Parser.pm
 ===================================================================
 --- trunk.orig/lib/setup-storage/Parser.pm
@@ -133,7 +134,7 @@
 -      return $min_size * POSIX::floor($dev_count / 2)
 -        if ($level eq "raid1");
        return $min_size * $dev_count if ($level eq "raid0");
-+      return $min_size * POSIX::floor($dev_count / 2) if ($level eq "raid1");
++      return $min_size if ($level eq "raid1");
        return $min_size * ($dev_count - 1) if ($level eq "raid5");
      } else {