update to vzctl-3.0.30.2

[vzctl.git] / debian / patches / allow-abs-ostemplate-path.diff

Index: new/src/lib/create.c
===================================================================
--- new.orig/src/lib/create.c	2012-02-10 06:33:24.000000000 +0100
+++ new/src/lib/create.c	2012-02-10 07:09:43.000000000 +0100
@@ -102,20 +102,25 @@
 	const char *ext[] = { "", ".gz", ".bz2", ".xz", NULL };
 	const char *errmsg_ext = "[.gz|.bz2|.xz]";
 
-find:
-	for (i = 0; ext[i] != NULL; i++) {
-		snprintf(tarball, sizeof(tarball), "%s/cache/%s.tar%s",
-				fs->tmpl, tmpl->ostmpl, ext[i]);
-		logger(1, 0, "Looking for %s", tarball);
-		if (stat_file(tarball))
-			break;
-	}
-	if (ext[i] == NULL) {
-		if (download_template(tmpl->ostmpl) == 0)
-			goto find;
-		logger(-1, 0, "Cached OS template %s/cache/%s.tar%s not found",
-				fs->tmpl, tmpl->ostmpl, errmsg_ext);
-		return VZ_OSTEMPLATE_NOT_FOUND;
+	if (tmpl->ostmpl[0] == '/' && stat_file(tmpl->ostmpl)) {
+		snprintf(tarball, sizeof(tarball), "%s", tmpl->ostmpl);
+	} else {
+
+	find:
+		for (i = 0; ext[i] != NULL; i++) {
+			snprintf(tarball, sizeof(tarball), "%s/cache/%s.tar%s",
+				 fs->tmpl, tmpl->ostmpl, ext[i]);
+			logger(1, 0, "Looking for %s", tarball);
+			if (stat_file(tarball))
+				break;
+		}
+		if (ext[i] == NULL) {
+			if (download_template(tmpl->ostmpl) == 0)
+				goto find;
+			logger(-1, 0, "Cached OS template %s/cache/%s.tar%s not found",
+			       fs->tmpl, tmpl->ostmpl, errmsg_ext);
+			return VZ_OSTEMPLATE_NOT_FOUND;
+		}
 	}
 	/* Lock CT area */
 	if (make_dir(fs->private, 0))
@@ -190,6 +195,7 @@
 	int ret = 0;
 	char src[STR_SIZE];
 	char dst[STR_SIZE];
+	char *p;
 	const char *sample_config;
 	fs_param *fs = &vps_p->res.fs;
 	tmpl_param *tmpl = &vps_p->res.tmpl;
@@ -312,6 +318,12 @@
 		}
 		if ((ret = fs_create(veid, fs, tmpl, &vps_p->res.dq)))
 			goto err_private;
+
+		if ((p = strrchr(tmpl->ostmpl, '/'))) {
+			p = strdup(p + 1);
+			free(tmpl->ostmpl);
+			tmpl->ostmpl = p;
+		}
 	}
 
 	if ((ret = vps_postcreate(veid, &vps_p->res)))