[Fai-commit] r5767 - branches/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2010-04-13 09:02:12 +0000 (Tue, 13 Apr 2010)
New Revision: 5767

Modified:
   branches/experimental/patches/grub-pc
   branches/experimental/patches/setup-storage_always-format
   branches/experimental/patches/setup-storage_no-cylinder-boundaries
Log:
make partition nr. 1 start at sector 63 (that requirement was dropped in earlier
versions of the no-cylinder-boundaries-patch, but AFAIK grub relies on that
space)


Modified: branches/experimental/patches/grub-pc
===================================================================
--- branches/experimental/patches/grub-pc	2010-04-13 08:39:38 UTC (rev 5766)
+++ branches/experimental/patches/grub-pc	2010-04-13 09:02:12 UTC (rev 5767)
@@ -36,10 +36,13 @@
 ===================================================================
 --- trunk.orig/examples/simple/scripts/GRUB_PC/10-setup
 +++ trunk/examples/simple/scripts/GRUB_PC/10-setup	
-@@ -2,8 +2,29 @@
+@@ -2,8 +2,28 @@
  
  error=0 ; trap "error=$((error|1))" ERR
  
+-$ROOTCMD grub-mkdevicemap -n -m /boot/grub/device.map
+-$ROOTCMD grub-mkconfig -o /boot/grub/grub.cfg
+-$ROOTCMD grub-install --no-floppy "(hd0)"
 +set -a
 +
 +# during softupdate use this file
@@ -51,10 +54,7 @@
 +# if class NOMBR is defined, write boot loader into root partition, not into mbr
 +ifclass NOMBR && BOOT_DEVICE=$BOOT_PARTITION
 +
- $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 lvm raid serial
++$ROOTCMD grub-mkimage --output=/boot/grub/core.img lvm raid
 +$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="lvm raid serial" "($grub_dev)"
++  $ROOTCMD /usr/sbin/grub-install --no-floppy --modules="lvm raid" "($grub_dev)"
 +  $ROOTCMD /usr/sbin/grub-setup   "($grub_dev)"
 +done
  

Modified: branches/experimental/patches/setup-storage_always-format
===================================================================
--- branches/experimental/patches/setup-storage_always-format	2010-04-13 08:39:38 UTC (rev 5766)
+++ branches/experimental/patches/setup-storage_always-format	2010-04-13 09:02:12 UTC (rev 5767)
@@ -33,7 +33,7 @@
        next;
      }
  
-@@ -526,6 +536,10 @@
+@@ -530,6 +540,10 @@
          }
        }
  
@@ -44,7 +44,7 @@
        next;
      }
  
-@@ -1003,8 +1017,9 @@
+@@ -1010,8 +1024,9 @@
        my $part = (\%FAI::configs)->{$config}->{partitions}->{$part_id};
  
        # skip preserved/resized/extended partitions

Modified: branches/experimental/patches/setup-storage_no-cylinder-boundaries
===================================================================
--- branches/experimental/patches/setup-storage_no-cylinder-boundaries	2010-04-13 08:39:38 UTC (rev 5766)
+++ branches/experimental/patches/setup-storage_no-cylinder-boundaries	2010-04-13 09:02:12 UTC (rev 5767)
@@ -32,22 +32,17 @@
  
    # set $start and $end to the effective values
    $start = $end_byte - $next_start + 1;
-@@ -646,13 +632,9 @@
-     my $next_start = 0;
+@@ -650,10 +636,6 @@
+       $next_start = $current_disk->{bios_sectors_per_track} *
+         $current_disk->{sector_size};
  
-     if ($FAI::configs{$config}{disklabel} eq "msdos") {
--      # on msdos disk labels, the first partitions starts at head #1
--      $next_start = $current_disk->{bios_sectors_per_track} *
--        $current_disk->{sector_size};
--
-       # the MBR requires space, too
+-      # the MBR requires space, too
 -      $min_req_total_space += $current_disk->{bios_sectors_per_track} *
 -        $current_disk->{sector_size};
-+      $next_start = $current_disk->{sector_size};
-+      $min_req_total_space += $current_disk->{sector_size};
- 
+-
      } elsif ($FAI::configs{$config}{disklabel} eq "gpt") {
        # on GPT-EFI disk labels the first 34 and last 33 sectors must be left alone
+       $next_start = 34 * $current_disk->{sector_size};
 @@ -665,13 +647,12 @@
        $min_req_total_space += (34 + 33) * $current_disk->{sector_size};