Merge pull request #2686 from 2xsec/rpm

lxc.spec.in

@@ -152,6 +152,11 @@ fi
 
 %post
 # This test should trigger a network configure on a new install.
+if [ ! -d @LXC_DISTRO_SYSCONF@ ]
+then
+	mkdir -p @LXC_DISTRO_SYSCONF@
+fi
+
 if [ ! -f @LXC_DISTRO_SYSCONF@/lxc-net ] || ! grep -q 'USE_LXC_BRIDGE=' @LXC_DISTRO_SYSCONF@/lxc-net
 then
 	# Grab a random 10net subnet.  Need to add test logic...
@@ -251,6 +256,7 @@ fi
 %defattr(-,root,root)
 %{_sbindir}/*
 %{_libdir}/*.so.*
+%{_libdir}/*.a
 %{_libdir}/%{name}
 %{_localstatedir}/*
 %{_libexecdir}/%{name}/hooks/unmount-namespace

src/lxc/confile.c

@@ -2493,7 +2493,6 @@ on_error:
 
 int lxc_config_read(const char *file, struct lxc_conf *conf, bool from_include)
 {
-	int ret;
 	struct parse_line_conf c;
 
 	c.conf = conf;

src/lxc/parse.c

@@ -81,12 +81,12 @@ int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *da
 	ret = fstat(fd, &st);
 	if (ret < 0) {
 		SYSERROR("Failed to stat config file \"%s\"", file);
-		goto on_error;
+		goto on_error_fstat;
 	}
 
 	ret = 0;
 	if (st.st_size == 0)
-		goto on_error;
+		goto on_error_fstat;
 
 	ret = -1;
 	buf = lxc_strmmap(NULL, st.st_size, PROT_READ | PROT_WRITE,
@@ -117,6 +117,7 @@ on_error:
 			ret = -1;
 	}
 
+on_error_fstat:
 	saved_errno = errno;
 	close(fd);
 	errno = saved_errno;