[Devel] Patch to correct order of unmounting in vzctl

[Maurice van der Pot]

Hi guys,

The attached patch corrects the unmount order in vzctl to follow the
description of it in the user manual (VPS umount before global umount
instead of the other way around). It applies to vzctl-3.0.0.8.

Regards,
Maurice.

-- 
Maurice van der Pot

Gentoo Linux Developer   griffon26 at gentoo.org     http://www.gentoo.org
Creator of BiteMe!       griffon26 at kfk4ever.com   http://www.kfk4ever.com

-------------- next part --------------
diff -ruN vzctl-3.0.0-8/src/lib/fs.c vzctl-3.0.0-8-patched/src/lib/fs.c
--- vzctl-3.0.0-8/src/lib/fs.c	2006-04-19 14:19:06.000000000 +0200
+++ vzctl-3.0.0-8-patched/src/lib/fs.c	2006-04-28 23:51:09.843033500 +0200
@@ -179,16 +179,16 @@
 		return 0;
 	}
 	if (!(skip & SKIP_ACTION_SCRIPT)) {
-		snprintf(buf, sizeof(buf), "%svps.%s", VPS_CONF_DIR,
-			UMOUNT_PREFIX);
+		snprintf(buf, sizeof(buf), "%s%d.%s", VPS_CONF_DIR,
+			veid, UMOUNT_PREFIX);
 		for (i = 0; i < 2; i++) {
 			if (run_pre_script(veid, buf)) {
 				logger(0, 0, "Error executing umount script %s",
 					buf);
 				return VZ_ACTIONSCRIPT_ERROR;
 			}
-			snprintf(buf, sizeof(buf), "%s%d.%s", VPS_CONF_DIR,
-				veid, UMOUNT_PREFIX);
+			snprintf(buf, sizeof(buf), "%svps.%s", VPS_CONF_DIR,
+				UMOUNT_PREFIX);
 		}
 	}
 	if (!(ret = fsumount(veid, root)))
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: not available
URL: <http://lists.openvz.org/pipermail/devel/attachments/20060429/f4e2a816/attachment-0001.sig>