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

[Michael Tautschnig]

Author: mt
Date: 2009-04-09 18:39:27 +0000 (Thu, 09 Apr 2009)
New Revision: 5323

Added:
   people/michael/experimental/patches/bugfix-504813
   people/michael/experimental/patches/bugfix-506463
Modified:
   people/michael/experimental/patches/series
   people/michael/experimental/patches/setup-storage_gpt-bios
Log:
added two more patches from the BTS to the experimental builds


Added: people/michael/experimental/patches/bugfix-504813
===================================================================
--- people/michael/experimental/patches/bugfix-504813	                        (rev 0)
+++ people/michael/experimental/patches/bugfix-504813	2009-04-09 18:39:27 UTC (rev 5323)
@@ -0,0 +1,17 @@
+2009-04-09  Michael Tautschnig  <mt at debian.org>
+
+	* fai-mirror: Set Dir::Etc option to $aptcache/etc/apt instead of changing
+		Dir::Etc::sourceslist only (thanks Sebastian Harl) (closes: #504813)
+Index: trunk/bin/fai-mirror
+===================================================================
+--- trunk.orig/bin/fai-mirror
++++ trunk/bin/fai-mirror	
+@@ -136,7 +136,7 @@
+       -o Dir::Cache=$aptcache/var/cache/apt \
+       -o Dir::State=$aptcache/var/cache/apt \
+       -o Dir::Cache::Archives=$archivedir \
+-      -o Dir::Etc::sourcelist=$aptcache/etc/apt/sources.list \
++      -o Dir::Etc=$aptcache/etc/apt/ \
+       -o Dir::State::Lists=$aptcache/var/lib/apt/lists/"
+ 
+     # not needed

Added: people/michael/experimental/patches/bugfix-506463
===================================================================
--- people/michael/experimental/patches/bugfix-506463	                        (rev 0)
+++ people/michael/experimental/patches/bugfix-506463	2009-04-09 18:39:27 UTC (rev 5323)
@@ -0,0 +1,17 @@
+2009-04-09  Michael Tautschnig  <mt at debian.org>
+
+	* get-config-dir-git: Do not clone into an existing directory (thanks
+		Sebastian Harl) (closes: #506463)
+Index: trunk/lib/get-config-dir-git
+===================================================================
+--- trunk.orig/lib/get-config-dir-git
++++ trunk/lib/get-config-dir-git	
+@@ -35,6 +35,8 @@
+    task_error 701 $?
+ else 
+    echo "Checking out from git"
++   # cloning into an existing directory is not allowed
++   if [ -d $FAI ]; then rmdir $FAI; fi
+    git clone $giturl $FAI 
+    task_error 702 $?
+ fi

Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2009-04-09 18:35:59 UTC (rev 5322)
+++ people/michael/experimental/patches/series	2009-04-09 18:39:27 UTC (rev 5323)
@@ -15,3 +15,5 @@
 setup-storage_missing-raid-devs
 setup-storage_cylinder-boundary
 setup-storage_fs-tool-check
+bugfix-504813
+bugfix-506463

Modified: people/michael/experimental/patches/setup-storage_gpt-bios
===================================================================
--- people/michael/experimental/patches/setup-storage_gpt-bios	2009-04-09 18:35:59 UTC (rev 5322)
+++ people/michael/experimental/patches/setup-storage_gpt-bios	2009-04-09 18:39:27 UTC (rev 5323)
@@ -8,7 +8,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
 +++ trunk/lib/setup-storage/Commands.pm	
-@@ -665,16 +665,17 @@
+@@ -673,16 +673,17 @@
    # the list of partitions that must be preserved
    my @to_preserve = &FAI::get_preserved_partitions($config);
  
@@ -30,7 +30,7 @@
  
    &FAI::rebuild_preserved_partitions($config, \@to_preserve);
  
-@@ -777,9 +778,8 @@
+@@ -785,9 +786,8 @@
  
    # write the disklabel again to drop the partition table and create a new one
    # that has the proper ids
@@ -42,7 +42,7 @@
  
    my $prev_id = -1;
    # generate the commands for creating all partitions
-@@ -829,6 +829,14 @@
+@@ -837,6 +837,14 @@
        &FAI::make_device_name($disk, $FAI::configs{$config}{bootable}),
        "boot_set_$disk" );
    }