chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
719e4e3
)
cryptsetup-generator: don't create tmp+swap units
author
Tom Gundersen
<teg@jklm.no>
Thu, 15 Aug 2013 00:47:59 +0000
(08:47 +0800)
committer
Tom Gundersen
<teg@jklm.no>
Fri, 13 Sep 2013 09:52:14 +0000
(11:52 +0200)
src/cryptsetup/cryptsetup-generator.c
patch
|
blob
|
history
diff --git
a/src/cryptsetup/cryptsetup-generator.c
b/src/cryptsetup/cryptsetup-generator.c
index 81b770890a170510ad31ff6a5b38e12fb4e66902..967c5e6e0b373875426e7052e782fd1611a2dc76 100644
(file)
--- a/
src/cryptsetup/cryptsetup-generator.c
+++ b/
src/cryptsetup/cryptsetup-generator.c
@@
-72,13
+72,20
@@
static int create_disk(
_cleanup_free_ char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL;
_cleanup_fclose_ FILE *f = NULL;
_cleanup_free_ char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL;
_cleanup_fclose_ FILE *f = NULL;
- bool noauto, nofail;
+ bool noauto, nofail
, tmp, swap
;
assert(name);
assert(device);
noauto = has_option(options, "noauto");
nofail = has_option(options, "nofail");
assert(name);
assert(device);
noauto = has_option(options, "noauto");
nofail = has_option(options, "nofail");
+ tmp = has_option(options, "tmp");
+ swap = has_option(options, "swap");
+
+ if (tmp && swap) {
+ log_error("Device '%s' cannot be both 'tmp' and 'swap'. Ignoring.", name);
+ return -EINVAL;
+ }
n = unit_name_from_path_instance("systemd-cryptsetup", name, ".service");
if (!n)
n = unit_name_from_path_instance("systemd-cryptsetup", name, ".service");
if (!n)
@@
-151,12
+158,12
@@
static int create_disk(
name, u, strempty(password), strempty(options),
name);
name, u, strempty(password), strempty(options),
name);
- if (
has_option(options, "tmp")
)
+ if (
tmp
)
fprintf(f,
"ExecStartPost=/sbin/mke2fs '/dev/mapper/%s'\n",
name);
fprintf(f,
"ExecStartPost=/sbin/mke2fs '/dev/mapper/%s'\n",
name);
- if (
has_option(options, "swap")
)
+ if (
swap
)
fprintf(f,
"ExecStartPost=/sbin/mkswap '/dev/mapper/%s'\n",
name);
fprintf(f,
"ExecStartPost=/sbin/mkswap '/dev/mapper/%s'\n",
name);