!37 lxc: set normal ret value when populate exist device successfully

Merge pull request !37 from wangkang101/master

0067-set-normal-ret-value-when-populate-exist-device-successfully.patch

@@ -0,0 +1,25 @@
+From e57686a8b94905829fc295981bc8d0a1253f186b Mon Sep 17 00:00:00 2001
+From: wangkang <wangkang101@huawei.com>
+Date: Fri, 22 May 2020 10:00:00 +0800
+Subject: [PATCH] lxc: set normal ret value when populate exist device
+ successfully
+
+---
+ src/lxc/conf.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index f46255a4..6890da12 100644
+--- a/src/lxc/conf.c
++++ b/src/lxc/conf.c
+@@ -4108,6 +4108,7 @@ static int setup_populate_devs(const struct lxc_rootfs *rootfs, struct lxc_list
+ 			ret = -1;
+ 			goto reset_umask;
+ 		}
++		ret = 0;
+ 	}
+ 
+ reset_umask:
+-- 
+2.18.2
+

lxc.spec

@@ -74,6 +74,7 @@ Patch9062:      0063-hook-fix-memeory-leak.patch
 Patch9063:      0064-termainal-fix-console-log-memory-leak.patch
 Patch9064:      0065-lxc-disable-terminal-stdout-stderr-pipe-O_NONBLOCK.patch
 Patch9065:      0066-lxc-fix-tests-build-error.patch
+Patch9066:      0067-set-normal-ret-value-when-populate-exist-device-successfully.patch
 
 BuildRequires:  systemd-units git libtool graphviz docbook2X doxygen chrpath
 BuildRequires:  pkgconfig(libseccomp)

series.conf

@@ -64,3 +64,4 @@
 0064-termainal-fix-console-log-memory-leak.patch
 0065-lxc-disable-terminal-stdout-stderr-pipe-O_NONBLOCK.patch
 0066-lxc-fix-tests-build-error.patch
+0067-set-normal-ret-value-when-populate-exist-device-successfully.patch