[Fai-commit] r5727 - people/michael/experimental/patches
Michael Tautschnig
mt at alioth.debian.org
Sun Feb 21 20:26:21 UTC 2010
Author: mt
Date: 2010-02-21 20:26:21 +0000 (Sun, 21 Feb 2010)
New Revision: 5727
Added:
people/michael/experimental/patches/setup-storage_mdadm-output
people/michael/experimental/patches/setup-storage_swap-fstab-bugfix
Modified:
people/michael/experimental/patches/grub-pc
people/michael/experimental/patches/series
people/michael/experimental/patches/setup-storage_GIB-support
Log:
Added setup-storage bugfixes, fixed grub-pc patch
Modified: people/michael/experimental/patches/grub-pc
===================================================================
--- people/michael/experimental/patches/grub-pc 2010-02-18 14:19:09 UTC (rev 5726)
+++ people/michael/experimental/patches/grub-pc 2010-02-21 20:26:21 UTC (rev 5727)
@@ -54,7 +54,7 @@
$ROOTCMD grub-mkdevicemap -n -m /boot/grub/device.map
-$ROOTCMD grub-mkconfig -o /boot/grub/grub.cfg
-$ROOTCMD grub-install --no-floppy "(hd0)"
-+$ROOTCMD grub-mkimage --output=/boot/grub/core.img ext2 pc gpt biosdisk lvm
++$ROOTCMD grub-mkimage --output=/boot/grub/core.img lvm raid serial
+$ROOTCMD update-grub
+
+for device in $BOOT_DEVICE; do
@@ -62,7 +62,7 @@
+ if [ -z "$grub_dev" ] ; then
+ grub_dev=$(echo $device | sed 's#^/dev/##')
+ fi
-+ $ROOTCMD /usr/sbin/grub-install --no-floppy --modules="ext2 _chain pc gpt biosdisk lvm raid serial" "($grub_dev)"
++ $ROOTCMD /usr/sbin/grub-install --no-floppy --modules="lvm raid serial" "($grub_dev)"
+ $ROOTCMD /usr/sbin/grub-setup "($grub_dev)"
+done
Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series 2010-02-18 14:19:09 UTC (rev 5726)
+++ people/michael/experimental/patches/series 2010-02-21 20:26:21 UTC (rev 5727)
@@ -6,3 +6,5 @@
setup-storage_no-cylinder-boundaries
setup-storage_lvm-preserve2
setup-storage_GIB-support
+setup-storage_mdadm-output
+setup-storage_swap-fstab-bugfix
Modified: people/michael/experimental/patches/setup-storage_GIB-support
===================================================================
--- people/michael/experimental/patches/setup-storage_GIB-support 2010-02-18 14:19:09 UTC (rev 5726)
+++ people/michael/experimental/patches/setup-storage_GIB-support 2010-02-21 20:26:21 UTC (rev 5727)
@@ -1,7 +1,7 @@
-2010-01-10 Michael Tautschnig <mt at debian.org>
+2010-02-21 Michael Tautschnig <mt at debian.org>
* setup-storage/Parser.pm: Ignore 'i' in GiB, MiB, etc. and treat those units
- like GB, MB, etc. Added deprecation warning for sole G, M, etc.
+ like GB, MB, etc.
* setup-storage/Sizes.pm: Use MiB instead of MB internally.
* setup-storage.8: Update syntax.
Index: trunk/lib/setup-storage/Parser.pm
@@ -17,7 +17,7 @@
#
# @param $val is the number with its unit
#
-@@ -298,15 +298,21 @@
+@@ -298,15 +298,22 @@
sub convert_unit
{
my ($val) = @_;
@@ -30,9 +30,10 @@
- $val = $1 * (1024 * 1024) if ($3 eq "T");
- $val = $1 * (1024 * 1024 * 1024) if ($3 eq "P");
+
-+ ($val =~ /([kKMGTP])\s*$/) and
-+ warn "Using $1 as size modifier is deprecated, please use $1iB or $1B
-+ instead; in future releases these will be treated as different modifiers\n";
++ ## don't warn for now, G/GiB/GB are all treated the same way
++ ## ($val =~ /([kKMGTP])\s*$/) and
++ ## warn "Using $1 as size modifier is deprecated, please use $1iB or $1B
++ ## instead; in future releases these will be treated as different modifiers\n";
+
# % is returned as is
+ if ($val =~ /^(\d+(\.\d+)?)%\s*$/) { 1; }
@@ -47,7 +48,7 @@
return $val;
}
-@@ -623,7 +629,7 @@
+@@ -623,7 +630,7 @@
1;
}
@@ -56,7 +57,7 @@
{
# complete the size specification to be a range in all cases
my $range = $1;
-@@ -641,7 +647,9 @@
+@@ -641,7 +648,9 @@
# convert the units, if necessary
my ($min, $max) = split (/-/, $range);
@@ -66,7 +67,7 @@
$max = &FAI::convert_unit($max);
$range = "$min-$max";
# enter the range into the hash
-@@ -652,13 +660,15 @@
+@@ -652,13 +661,15 @@
$FAI::configs{$FAI::device}{preserveparts} = 1;
}
}
Added: people/michael/experimental/patches/setup-storage_mdadm-output
===================================================================
--- people/michael/experimental/patches/setup-storage_mdadm-output (rev 0)
+++ people/michael/experimental/patches/setup-storage_mdadm-output 2010-02-21 20:26:21 UTC (rev 5727)
@@ -0,0 +1,17 @@
+2010-02-21 Michael Tautschnig <mt at debian.org>
+
+ * setup-storage/Volumes.pm: Handle new mdadm output format (thanks Brian Kroth
+ for the patch). (closes: #568794)
+Index: trunk/lib/setup-storage/Volumes.pm
+===================================================================
+--- trunk.orig/lib/setup-storage/Volumes.pm
++++ trunk/lib/setup-storage/Volumes.pm
+@@ -372,7 +372,7 @@
+
+ # parse the output line by line
+ foreach my $line (@mdadm_print) {
+- if ($line =~ /^ARRAY \/dev\/md(\d+) level=(\S+) num-devices=\d+(\s+|$)/) {
++ if ($line =~ /^ARRAY \/dev\/md[\/]?(\d+) level=(\S+) num-devices=\d+(\s+|$)/) {
+ $id = $1;
+ $FAI::current_raid_config{$id}{mode} = $2;
+ &FAI::push_command( "true", "", "exist_/dev/md$id" );
Added: people/michael/experimental/patches/setup-storage_swap-fstab-bugfix
===================================================================
--- people/michael/experimental/patches/setup-storage_swap-fstab-bugfix (rev 0)
+++ people/michael/experimental/patches/setup-storage_swap-fstab-bugfix 2010-02-21 20:26:21 UTC (rev 5727)
@@ -0,0 +1,17 @@
+2010-02-21 Michael Tautschnig <mt at debian.org>
+
+ * setup-storage/Fstab.pm: fsck priority of swap should be 0 instead of 2
+ (closes: #568800).
+Index: trunk/lib/setup-storage/Fstab.pm
+===================================================================
+--- trunk.orig/lib/setup-storage/Fstab.pm
++++ trunk/lib/setup-storage/Fstab.pm
+@@ -60,7 +60,7 @@
+ # order of filesystem checks: the root filesystem gets a 1, the others
+ # get 2, swap gets 0
+ $fstab_line[-1] = 1 if ($d_ref->{mountpoint} eq "/");
+- $fstab_line[-1] = 0 if ($d_ref->{mountpoint} eq "swap");
++ $fstab_line[-1] = 0 if ($d_ref->{filesystem} eq "swap");
+
+ # set the ROOT_PARTITION variable, if this is the mountpoint for /
+ $FAI::disk_var{ROOT_PARTITION} = $name
More information about the Fai-commit
mailing list