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

[Michael Tautschnig]

Author: mt
Date: 2009-04-19 18:22:15 +0000 (Sun, 19 Apr 2009)
New Revision: 5363

Removed:
   people/michael/experimental/patches/bugfix-464541
   people/michael/experimental/patches/bugfix-504813
   people/michael/experimental/patches/bugfix-506463
Modified:
   people/michael/experimental/patches/series
Log:
removed patches that were merged into trunk


Deleted: people/michael/experimental/patches/bugfix-464541
===================================================================
--- people/michael/experimental/patches/bugfix-464541	2009-04-19 17:17:48 UTC (rev 5362)
+++ people/michael/experimental/patches/bugfix-464541	2009-04-19 18:22:15 UTC (rev 5363)
@@ -1,18 +0,0 @@
-2008-08-23  Michael Tautschnig  <mt at debian.org>
-
-	* lib/mount2dir: Add commands to create /var/lock and /var/run on the
-		filesystem mounted at / (closes: #464541)
-Index: trunk/lib/mount2dir
-===================================================================
---- trunk.orig/lib/mount2dir
-+++ trunk/lib/mount2dir	
-@@ -87,6 +87,9 @@
- 	    # should we fsck the partition first?
- 	    [ "$fscheck" = 1 ] && fsck -nt $fstype $device
- 	    mount -t $fstype -o noatime $mopt $device $target$mountpoint
-+	    if [ "$mountpoint" = "/" ] ; then
-+	      mkdir -p $target/var/lock $target/var/run
-+	    fi
-     esac
- done
- 

Deleted: people/michael/experimental/patches/bugfix-504813
===================================================================
--- people/michael/experimental/patches/bugfix-504813	2009-04-19 17:17:48 UTC (rev 5362)
+++ people/michael/experimental/patches/bugfix-504813	2009-04-19 18:22:15 UTC (rev 5363)
@@ -1,17 +0,0 @@
-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

Deleted: people/michael/experimental/patches/bugfix-506463
===================================================================
--- people/michael/experimental/patches/bugfix-506463	2009-04-19 17:17:48 UTC (rev 5362)
+++ people/michael/experimental/patches/bugfix-506463	2009-04-19 18:22:15 UTC (rev 5363)
@@ -1,17 +0,0 @@
-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-19 17:17:48 UTC (rev 5362)
+++ people/michael/experimental/patches/series	2009-04-19 18:22:15 UTC (rev 5363)
@@ -1,5 +1,4 @@
 logtail
-bugfix-464541
 grub-pc
 bugfix-506459
 bugfix-412889
@@ -11,6 +10,4 @@
 bugfix-520554
 bugfix-524347
 setup-storage_missing-raid-devs
-bugfix-504813
-bugfix-506463
 bugfix-515704