shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-13 00:58:27 +03:00
Code

fstab-generator: refuse to add swap earlier if disabled

Browse Source 
No functional change, preparation for later commits.
This commit is contained in:
Yu Watanabe 2023-05-24 07:24:52 +09:00
parent 256604ccdd
commit 9445623363
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fstab-generator/fstab-generator.c
View File

@ -111,11 +111,6 @@ static int add_swap(
assert(what); assert(what);
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) { if (access("/proc/swaps", F_OK) < 0) {
log_info("Swap not supported, ignoring fstab swap entry for %s.", what); log_info("Swap not supported, ignoring fstab swap entry for %s.", what);
return 0; return 0;
@ -718,6 +713,10 @@ static int parse_fstab_one(
return 0; return 0;
is_swap = streq_ptr(fstype, "swap"); is_swap = streq_ptr(fstype, "swap");
if (is_swap && !arg_swap_enabled) {
log_info("Swap unit generation disabled on kernel command line, ignoring swap entry for %s.", what);
return 0;
}
what = fstab_node_to_udev_node(what_original); what = fstab_node_to_udev_node(what_original);
if (!what) if (!what)