commit bffb5a7b3969765e186d0ed8688a27a3dadd6cef
Author: Kristian Høgh <kfh@segtel-kfh.localdomain>
Date:   Fri Dec 8 11:56:06 2006 +0100

    Add VERBOSE option to vz.conf
    Defaults to 0 if unset.

diff --git a/etc/vz.conf b/etc/vz.conf
index 29d13ff..a230f5a 100644
--- a/etc/vz.conf
+++ b/etc/vz.conf
@@ -8,6 +8,7 @@ ## Logging parameters
 LOGGING=yes
 LOGFILE=/var/log/vzctl.log
 LOG_LEVEL=0
+VERBOSE=0
 
 ## Disk quota parameters
 DISK_QUOTA=yes
diff --git a/include/res.h b/include/res.h
index bb4ec31..6a5e137 100644
--- a/include/res.h
+++ b/include/res.h
@@ -105,6 +105,7 @@ struct log_s {
         char *log_file;
         int level;
         int enable;
+        int verbose;
 };
 
 struct vps_param {
diff --git a/include/vzctl_param.h b/include/vzctl_param.h
index ab4790e..0037b5c 100644
--- a/include/vzctl_param.h
+++ b/include/vzctl_param.h
@@ -129,6 +129,7 @@ #define PARAM_NETIF_MAC		354
 #define PARAM_NETIF_IFNAME	355
 #define PARAM_NETIF_HOST_MAC	356
 #define PARAM_NETIF_HOST_IFNAME	357
+#define PARAM_VERBOSE		358
 
 #define PARAM_LINE		"e:p:f:t:i:l:k:a:b:n:x:h"
 #endif
diff --git a/man/vz.conf.5 b/man/vz.conf.5
index f5448ce..fc9a386 100644
--- a/man/vz.conf.5
+++ b/man/vz.conf.5
@@ -29,7 +29,9 @@ Enables or disables logging. This parame
 Set location of log file, default is \f(CR/var/log/vzctl.log\fR.
 .IP "\fBLOG_LEVEL\fR=\fInumber\fR"
 Set the logging level. The more \fInumber\fR is, the more information will be
-displayed.
+logged.
+.IP "\fBVERBOSE\fR=\fInumber\fR"
+Set the output verbosity. Default is 0.
 .SS Disk quota parameters
 .IP \fBDISK_QUOTA\fR=\fByes\fR|\fBno\fR
 In case the value of this parameter is set to \fBno\fR, all disk
diff --git a/src/lib/config.c b/src/lib/config.c
index 3128ce9..bd3db10 100644
--- a/src/lib/config.c
+++ b/src/lib/config.c
@@ -53,6 +53,7 @@ static vps_config config[] = {
 {"LOGGING",	NULL, PARAM_LOGGING},
 {"LOG_LEVEL",	NULL, PARAM_LOGLEVEL},
 {"LOGFILE",	NULL, PARAM_LOGFILE},
+{"VERBOSE",	NULL, PARAM_VERBOSE},
 
 {"IPTABLES",	NULL, PARAM_IPTABLES},
 /*	UB	*/
@@ -1806,6 +1807,11 @@ static int parse(envid_t veid, vps_param
 			break;
 		vps_p->log.level = int_id;
 		break;
+	case PARAM_VERBOSE:
+		if (parse_int(val, &int_id))
+			break;
+		vps_p->log.verbose = int_id;
+		break;
 	case PARAM_IPTABLES:
 		ret = parse_iptables(&vps_p->res.env, val);
 		break;
diff --git a/src/vzctl.c b/src/vzctl.c
index 3273c63..6b82298 100644
--- a/src/vzctl.c
+++ b/src/vzctl.c
@@ -120,6 +120,7 @@ int main(int argc, char *argv[], char *e
 	gparam = init_vps_param();
 	vps_p = init_vps_param();
 	cmd_p = init_vps_param();
+	gparam->log.verbose = 0;
 
 	sigemptyset(&act.sa_mask);
 	act.sa_handler = SIG_IGN;
@@ -249,6 +250,8 @@ int main(int argc, char *argv[], char *e
 	}
 	if(!verbose_abs_unset)
 		verbose = verbose_abs;
+	else
+		verbose = gparam->log.verbose;
 	verbose += verbose_inc;
 	if(verbose < -1)
 		verbose = -1;