diff options
author | nabijaczleweli <nabijaczleweli@gmail.com> | 2019-12-21 07:17:59 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-03-12 17:52:43 +0100 |
commit | 567a5307601728c618546c584f63307283fa8def (patch) | |
tree | 89f29d8c14d25f9915ce3d39ec5fd3e0f363e053 /src/fstab-generator | |
parent | 392a2d51482f4a4bd18e7602c0dbc597f7b98c0f (diff) | |
download | systemd-567a5307601728c618546c584f63307283fa8def.tar.gz |
fstab-generator: handle systemd.swap= command-line argument
Don't generate swap units if set to false
The inverse of this argument is present as "noswap" on Debian sysvinit
Ref:
https://salsa.debian.org/debian/sysvinit/blob/4422988cb41c3022eee7444378cac3b2e36eac28/debian/vars.sh#L34
https://salsa.debian.org/debian/sysvinit/blob/4422988cb41c3022eee7444378cac3b2e36eac28/debian/src/initscripts/etc/init.d/mountall.sh#L78
Fixes https://github.com/systemd/systemd/issues/6686
Diffstat (limited to 'src/fstab-generator')
-rw-r--r-- | src/fstab-generator/fstab-generator.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 5a0a871759..08c7b76dba 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -40,6 +40,7 @@ typedef enum MountpointFlags { static const char *arg_dest = NULL; static const char *arg_dest_late = NULL; static bool arg_fstab_enabled = true; +static bool arg_swap_enabled = true; static char *arg_root_what = NULL; static char *arg_root_fstype = NULL; static char *arg_root_options = NULL; @@ -98,6 +99,11 @@ static int add_swap( assert(what); assert(me); + if (!arg_swap_enabled) { + log_info("Swap unit generation disabled on kernel command line, ignoring fstab swap entry for %s.", what); + return 0; + } + if (access("/proc/swaps", F_OK) < 0) { log_info("Swap not supported, ignoring fstab swap entry for %s.", what); return 0; @@ -896,6 +902,14 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat arg_volatile_mode = m; } else arg_volatile_mode = VOLATILE_YES; + + } else if (streq(key, "systemd.swap")) { + + r = value ? parse_boolean(value) : 1; + if (r < 0) + log_warning("Failed to parse systemd.swap switch %s. Ignoring.", value); + else + arg_swap_enabled = r; } return 0; |