[Pkg-ganeti-commits] r53 - trunk/instance-debootstrap/debian/patches

[iustin-guest at alioth.debian.org]

Author: iustin-guest
Date: 2008-07-07 19:42:05 +0000 (Mon, 07 Jul 2008)
New Revision: 53

Removed:
   trunk/instance-debootstrap/debian/patches/cache_in_var_cache.patch
Log:
Remove patch as this has been integrated upstream


Deleted: trunk/instance-debootstrap/debian/patches/cache_in_var_cache.patch
===================================================================
--- trunk/instance-debootstrap/debian/patches/cache_in_var_cache.patch	2008-07-04 20:52:41 UTC (rev 52)
+++ trunk/instance-debootstrap/debian/patches/cache_in_var_cache.patch	2008-07-07 19:42:05 UTC (rev 53)
@@ -1,26 +0,0 @@
-diff -urN ganeti-instance-debian-etch-0.4.orig/create ganeti-instance-debian-etch-0.4/create
---- ganeti-instance-debian-etch-0.4.orig/create	2007-11-28 08:48:24.000000000 +0100
-+++ ganeti-instance-debian-etch-0.4/create	2008-02-19 20:27:05.335127422 +0100
-@@ -23,7 +23,9 @@
- # node's sources.list
- MIRROR="http://ftp.debian.org/debian"
- DPKG_ARCH="`dpkg --print-architecture`"
--CACHE_FILE="cache-${DPKG_ARCH}.tar"
-+CACHE_DIR="/var/cache/ganeti-instance-debian-etch"
-+CACHE_FILE="$CACHE_DIR/cache-${DPKG_ARCH}.tar"
-+NOCACHE_FILE="/etc/ganeti/instance-debian-etch/no-cache"
- 
- TEMP=`getopt -o i:b:s: -n '$0' -- "$@"`
- 
-@@ -80,7 +82,10 @@
- 
- 	rm -f "$TMPDIR/etc/udev/rules.d/z25_persistent-net.rules"
- 
--	if [ ! -e no_cache ]; then
-+	if [ ! -e "$NOCACHE_FILE" ]; then
-+		if [ ! -d "$CACHE_DIR" ]; then
-+			mkdir -p "$CACHE_DIR"
-+		fi
- 		TMP_CACHE=`mktemp "${CACHE_FILE}.XXXXXX"`
- 		tar cf "$TMP_CACHE" -C $TMPDIR .
- 		mv "$TMP_CACHE" "$CACHE_FILE"