confile: config_ephemeral()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 1fe536397de95409c2697291a2ccdf4da455fef9..fe21ba3856092cda441acfc1f44eea89ad37cd71 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -3385,7 +3385,6 @@ static bool new_hwaddr(char *hwaddr)
 {
        int ret;
 
-       /* COMMENT(brauner): Initialize random number generator. */
        (void)randseed(true);
 
        ret = snprintf(hwaddr, 18, "00:16:3e:%02x:%02x:%02x", rand() % 255,
@@ -3474,9 +3473,13 @@ bool network_new_hwaddrs(struct lxc_conf *conf)
 static int config_ephemeral(const char *key, const char *value,
                            struct lxc_conf *lxc_conf)
 {
-       if (config_value_empty(value))
+       /* Set config value to default. */
+       if (config_value_empty(value)) {
+               lxc_conf->ephemeral = 0;
                return 0;
+       }
 
+       /* Parse new config value. */
        if (lxc_safe_uint(value, &lxc_conf->ephemeral) < 0)
                return -1;