nspawn: add volatile mode multiplexer call setup_volatile_mode()

Just some refactoring, no change in behaviour.
2019-03-01 14:11:06 +01:00
parent 0646d3c3dd
commit e5b43a04b6
3 changed files with 26 additions and 27 deletions
@@ -2933,17 +2933,7 @@ static int outer_child(
        if (r < 0)
                return r;

-        r = setup_volatile(
-                        directory,
-                        arg_volatile_mode,
-                        arg_userns_mode != USER_NAMESPACE_NO,
-                        arg_uid_shift,
-                        arg_uid_range,
-                        arg_selinux_context);
-        if (r < 0)
-                return r;
-
-        r = setup_volatile_state(
+        r = setup_volatile_mode(
                        directory,
                        arg_volatile_mode,
                        arg_userns_mode != USER_NAMESPACE_NO,