chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fstab-generator: log_oom() if automount_name is null
[elogind.git]
/
src
/
fstab-generator
/
fstab-generator.c
diff --git
a/src/fstab-generator/fstab-generator.c
b/src/fstab-generator/fstab-generator.c
index 4eaa52d1c248f23e7678cec69d18f7af123dfcb5..2a779bbccf800cc80dc2233b14e1b2b7de0f0dc6 100644
(file)
--- a/
src/fstab-generator/fstab-generator.c
+++ b/
src/fstab-generator/fstab-generator.c
@@
-69,7
+69,7
@@
static int mount_find_pri(struct mntent *me, int *ret) {
errno = 0;
r = strtoul(pri, &end, 10);
errno = 0;
r = strtoul(pri, &end, 10);
- if (errno
!=
0)
+ if (errno
>
0)
return -errno;
if (end == pri || (*end != ',' && *end != 0))
return -errno;
if (end == pri || (*end != ',' && *end != 0))
@@
-80,8
+80,8
@@
static int mount_find_pri(struct mntent *me, int *ret) {
}
static int add_swap(const char *what, struct mntent *me) {
}
static int add_swap(const char *what, struct mntent *me) {
-
char _cleanup_free_
*name = NULL, *unit = NULL, *lnk = NULL, *device = NULL;
-
FILE _cleanup_fclose_
*f = NULL;
+
_cleanup_free_ char
*name = NULL, *unit = NULL, *lnk = NULL, *device = NULL;
+
_cleanup_fclose_ FILE
*f = NULL;
bool noauto, nofail;
int r, pri = -1;
bool noauto, nofail;
int r, pri = -1;
@@
-214,10
+214,10
@@
static int add_mount(
const char *online,
const char *post,
const char *source) {
const char *online,
const char *post,
const char *source) {
- char _cleanup_free_
+ _cleanup_free_ char
*name = NULL, *unit = NULL, *lnk = NULL, *device = NULL,
*automount_name = NULL, *automount_unit = NULL;
*name = NULL, *unit = NULL, *lnk = NULL, *device = NULL,
*automount_name = NULL, *automount_unit = NULL;
-
FILE _cleanup_fclose_
*f = NULL;
+
_cleanup_fclose_ FILE
*f = NULL;
int r;
assert(what);
int r;
assert(what);
@@
-351,7
+351,7
@@
static int add_mount(
if (automount && !path_equal(where, "/")) {
automount_name = unit_name_from_path(where, ".automount");
if (automount && !path_equal(where, "/")) {
automount_name = unit_name_from_path(where, ".automount");
- if (!name)
+ if (!
automount_
name)
return log_oom();
automount_unit = strjoin(arg_dest, "/", automount_name, NULL);
return log_oom();
automount_unit = strjoin(arg_dest, "/", automount_name, NULL);
@@
-425,7
+425,7
@@
static int parse_fstab(const char *prefix, bool initrd) {
}
while ((me = getmntent(f))) {
}
while ((me = getmntent(f))) {
-
char _cleanup_free_
*where = NULL, *what = NULL;
+
_cleanup_free_ char
*where = NULL, *what = NULL;
int k;
if (initrd && !mount_in_initrd(me))
int k;
if (initrd && !mount_in_initrd(me))
@@
-492,6
+492,7
@@
static int parse_new_root_from_proc_cmdline(void) {
char *w, *state;
int r;
size_t l;
char *w, *state;
int r;
size_t l;
+ bool noauto, nofail;
r = read_one_line_file("/proc/cmdline", &line);
if (r < 0) {
r = read_one_line_file("/proc/cmdline", &line);
if (r < 0) {
@@
-547,6
+548,9
@@
static int parse_new_root_from_proc_cmdline(void) {
}
}
}
}
+ noauto = !!strstr(opts, "noauto");
+ nofail = !!strstr(opts, "nofail");
+
if (!what) {
log_debug("Could not find a root= entry on the kernel commandline.");
return 0;
if (!what) {
log_debug("Could not find a root= entry on the kernel commandline.");
return 0;
@@
-558,14
+562,14
@@
static int parse_new_root_from_proc_cmdline(void) {
}
log_debug("Found entry what=%s where=/sysroot type=%s", what, type);
}
log_debug("Found entry what=%s where=/sysroot type=%s", what, type);
- r = add_mount(what, "/sysroot", type, opts, 0,
false, false
, false,
+ r = add_mount(what, "/sysroot", type, opts, 0,
noauto, nofail
, false,
false, NULL, NULL, NULL, SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
return (r < 0) ? r : 0;
}
static int parse_proc_cmdline(void) {
false, NULL, NULL, NULL, SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
return (r < 0) ? r : 0;
}
static int parse_proc_cmdline(void) {
-
char _cleanup_free_
*line = NULL;
+
_cleanup_free_ char
*line = NULL;
char *w, *state;
int r;
size_t l;
char *w, *state;
int r;
size_t l;
@@
-580,7
+584,7
@@
static int parse_proc_cmdline(void) {
}
FOREACH_WORD_QUOTED(w, l, line, state) {
}
FOREACH_WORD_QUOTED(w, l, line, state) {
-
char _cleanup_free_
*word = NULL;
+
_cleanup_free_ char
*word = NULL;
word = strndup(w, l);
if (!word)
word = strndup(w, l);
if (!word)
@@
-596,9
+600,9
@@
static int parse_proc_cmdline(void) {
} else if (startswith(word, "rd.fstab=")) {
if (in_initrd()) {
} else if (startswith(word, "rd.fstab=")) {
if (in_initrd()) {
- r = parse_boolean(word +
6
);
+ r = parse_boolean(word +
9
);
if (r < 0)
if (r < 0)
- log_warning("Failed to parse fstab switch %s. Ignoring.", word +
6
);
+ log_warning("Failed to parse fstab switch %s. Ignoring.", word +
9
);
else
arg_enabled = r;
}
else
arg_enabled = r;
}