update to vzctl 4.0

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

Index: new/src/lib/create.c
===================================================================
--- new.orig/src/lib/create.c	2012-09-28 09:05:45.000000000 +0200
+++ new/src/lib/create.c	2012-09-28 09:57:03.000000000 +0200
@@ -113,19 +113,25 @@
 	if (ploop && check_ploop_size(dq->diskspace[1]) < 0)
 		return VZ_DISKSPACE_NOT_SET;
 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 {
+
+		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))
@@ -236,6 +242,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;
@@ -364,6 +371,12 @@
 						vps_p->opt.layout,
 						vps_p->opt.mode)))
 			goto err_root;
+
+		if ((p = strrchr(tmpl->ostmpl, '/'))) {
+			p = strdup(p + 1);
+			free(tmpl->ostmpl);
+			tmpl->ostmpl = p;
+		}
 	}
 
 	if ((ret = vps_postcreate(veid, &vps_p->res)))