chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fsck: use _cleanup_close_pair_ where appropriate
[elogind.git]
/
src
/
cryptsetup
/
cryptsetup-generator.c
diff --git
a/src/cryptsetup/cryptsetup-generator.c
b/src/cryptsetup/cryptsetup-generator.c
index 3657890df4c18418eea78234f7b2caaf4eac9027..5a0611afbbb4ad7650f1c35d534504c3dd8d87ad 100644
(file)
--- a/
src/cryptsetup/cryptsetup-generator.c
+++ b/
src/cryptsetup/cryptsetup-generator.c
@@
-20,11
+20,8
@@
***/
#include <errno.h>
***/
#include <errno.h>
-#include <string.h>
-#include <unistd.h>
#include "dropin.h"
#include "dropin.h"
-#include "fileio.h"
#include "generator.h"
#include "hashmap.h"
#include "log.h"
#include "generator.h"
#include "hashmap.h"
#include "log.h"
@@
-67,8
+64,8
@@
static int create_disk(
assert(name);
assert(device);
assert(name);
assert(device);
- noauto = fstab_test_
option(options, "no
auto\0");
- nofail = fstab_test_
option(options, "no
fail\0");
+ noauto = fstab_test_
yes_no_option(options, "noauto\0" "
auto\0");
+ nofail = fstab_test_
yes_no_option(options, "nofail\0" "
fail\0");
tmp = fstab_test_option(options, "tmp\0");
swap = fstab_test_option(options, "swap\0");
tmp = fstab_test_option(options, "tmp\0");
swap = fstab_test_option(options, "swap\0");
@@
-183,7
+180,7
@@
static int create_disk(
if (ferror(f))
return log_error_errno(errno, "Failed to write file %s: %m", p);
if (ferror(f))
return log_error_errno(errno, "Failed to write file %s: %m", p);
- from = str
append
a("../", n);
+ from = str
join
a("../", n);
if (!noauto) {
if (!noauto) {