SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swap: use swapon -o

Browse Source 
This patch simplify swapon usage in systemd. The command swapon(8)
since util-linux v2.26 supports "-o <list>". The idea is exactly the
same like for mount(8). The -o specifies options in fstab-compatible
way. For systemd it means that it does not have to care about things
like "discard" or another swapon specific options.

        swapon -o <options-from-fstab>

For backward compatibility the code cares about "Priority:" swap unit
field (for a case when Priority: is set, but pri= in the Options: is
missing).

References: http://lists.freedesktop.org/archives/systemd-devel/2014-October/023576.html
This commit is contained in:
Karel Zak
2015-05-25 17:06:15 +02:00
committed by Tom Gundersen
parent 49f582c0a0
commit bf1d7ba70a
4 changed files with 26 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fstab-generator/fstab-generator.c
+5 -23
View File
@@ -53,10 +53,9 @@ static int add_swap(
bool noauto,
bool nofail) {
_cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL, *filtered = NULL;
_cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL;
_cleanup_fclose_ FILE *f = NULL;
int r, pri = -1;
const char *opts;
int r;
assert(what);
assert(me);
@@ -71,18 +70,6 @@ static int add_swap(
return 0;
}
opts = me->mnt_opts;
r = fstab_find_pri(opts, &pri);
if (r < 0) {
log_error_errno(r, "Failed to parse priority, ignoring: %m");
/* Remove invalid pri field */
r = fstab_filter_options(opts, "pri\0", NULL, NULL, &filtered);
if (r < 0)
return log_error_errno(r, "Failed to parse options: %m");
opts = filtered;
}
r = unit_name_from_path(what, ".swap", &name);
if (r < 0)
return log_error_errno(r, "Failed to generate unit name: %m");
@@ -109,20 +96,15 @@ static int add_swap(
"What=%s\n",
what);
/* Note that we currently pass the priority field twice, once
* in Priority=, and once in Options= */
if (pri >= 0)
fprintf(f, "Priority=%i\n", pri);
if (!isempty(opts) && !streq(opts, "defaults"))
fprintf(f, "Options=%s\n", opts);
if (!isempty(me->mnt_opts) && !streq(me->mnt_opts, "defaults"))
fprintf(f, "Options=%s\n", me->mnt_opts);
r = fflush_and_check(f);
if (r < 0)
return log_error_errno(r, "Failed to write unit file %s: %m", unit);
/* use what as where, to have a nicer error message */
r = generator_write_timeouts(arg_dest, what, what, opts, NULL);
r = generator_write_timeouts(arg_dest, what, what, me->mnt_opts, NULL);
if (r < 0)
return r;