FL-786: localmount: support filesystem mounting on openvz

We need allocate space for both the added leading '-' and the trailing
'\0'.

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.12
+VERSION=	0.12.2
 PKG=		${NAME}-${VERSION}

init.d/localmount.in

@@ -9,7 +9,7 @@ depend()
 	need fsck
 	use lvm modules mtab
 	after lvm modules
-	keyword -jail -openvz -prefix -vserver -lxc
+	keyword -jail -prefix -vserver -lxc
 }
 
 start()

init.d/netmount.in

@@ -12,7 +12,7 @@ depend()
 	config /etc/fstab
 	use afc-client amd autofs openvpn
 	use dns
-	keyword -jail -prefix -vserver
+	keyword -jail -prefix -vserver -lxc
 }
 
 start()

sh/rc-cgroup.sh.in

@@ -116,7 +116,7 @@ cgroup_set_limits()
 
 cgroup_cleanup()
 {
-	yesno "${rc_cgroup_cleanup:-no}" && cgroup_running || return 0
+	cgroup_running || return 0
 	ebegin "starting cgroups cleanup"
 	for sig in TERM QUIT INT; do
 		cgroup_get_pids || { eend 0 "finished" ; return 0 ; }

sh/runscript.sh.in

@@ -308,6 +308,7 @@ while [ -n "$1" ]; do
 				fi
 				[ "$(command -v cgroup_cleanup)" = "cgroup_cleanup" -a \
 				"$1" = "stop" ] && \
+				yesno "${rc_cgroup_cleanup}" && \
 					cgroup_cleanup
 				shift
 				continue 2

src/librc/librc-depend.c

@@ -856,7 +856,7 @@ rc_deptree_update(void)
 	 * work for them. This doesn't stop them from being run directly. */
 	if (sys) {
 		len = strlen(sys);
-		nosys = xmalloc(len + 1);
+		nosys = xmalloc(len + 2);
 		nosys[0] = '-';
 		for (i = 0; i < len; i++)
 			nosys[i + 1] = (char)tolower((unsigned char)sys[i]);

src/librc/librc.c

@@ -193,7 +193,7 @@ file_regex(const char *file, const char *regex)
 			str += strlen(str) + 1;
 			/* len is the size of allocated buffer and we don't
 			   want call regexec BUFSIZE times. find next str */
-			while (*str == '\0' && str < line + len)
+			while (str < line + len && *str == '\0')
 				str++;
 		} while (str < line + len);
 	}

src/rc/start-stop-daemon.c

@@ -316,14 +316,12 @@ get_pid(const char *pidfile, bool quiet)
 		return -1;
 
 	if ((fp = fopen(pidfile, "r")) == NULL) {
-		if (!quiet)
+		ewarnv("%s: fopen `%s': %s", applet, pidfile, strerror(errno));
-			eerror("%s: fopen `%s': %s", applet, pidfile, strerror(errno));
 		return -1;
 	}
 
 	if (fscanf(fp, "%d", &pid) != 1) {
-		if (!quiet)
+		ewarnv("%s: no pid found in `%s'", applet, pidfile);
-			eerror("%s: no pid found in `%s'", applet, pidfile);
 		fclose(fp);
 		return -1;
 	}
@@ -461,7 +459,7 @@ run_stop_schedule(const char *exec, const char *const *argv,
 				{
 					if ((nrunning = do_stop(exec, argv,
 						    pid, uid, 0, true, false,
-						    true)) == 0)
+	test)) == 0)
 						return 0;
 
 
@@ -1088,7 +1086,7 @@ start_stop_daemon(int argc, char **argv)
 		pid = 0;
 
 	if (do_stop(exec, (const char * const *)margv, pid, uid,
-		0, true, false, true) > 0)
+		0, true, false, test) > 0)
 		eerrorx("%s: %s is already running", applet, exec);
 
 	if (test) {
@@ -1366,7 +1364,7 @@ start_stop_daemon(int argc, char **argv)
 			} else
 				pid = 0;
 			if (do_stop(exec, (const char *const *)margv,
-				pid, uid, 0, true, false, true) > 0)
+				pid, uid, 0, true, false, test) > 0)
 				alive = true;
 		}