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: avoid mangling of mount source string
[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 8676a20539c5c10596920c023e0914f7a3237030..d9ba3e32e2a9475e54304508948a2f01af6d6fc9 100644
(file)
--- a/
src/fstab-generator/fstab-generator.c
+++ b/
src/fstab-generator/fstab-generator.c
@@
-151,7
+151,7
@@
static int add_swap(const char *what, struct mntent *me) {
goto finish;
}
goto finish;
}
- mkdir_parents(lnk, 0755);
+ mkdir_parents
_label
(lnk, 0755);
if (symlink(unit, lnk) < 0) {
log_error("Failed to create symlink: %m");
r = -errno;
if (symlink(unit, lnk) < 0) {
log_error("Failed to create symlink: %m");
r = -errno;
@@
-174,7
+174,7
@@
static int add_swap(const char *what, struct mntent *me) {
goto finish;
}
goto finish;
}
- mkdir_parents(lnk, 0755);
+ mkdir_parents
_label
(lnk, 0755);
if (symlink(unit, lnk) < 0) {
log_error("Failed to create symlink: %m");
r = -errno;
if (symlink(unit, lnk) < 0) {
log_error("Failed to create symlink: %m");
r = -errno;
@@
-326,7
+326,7
@@
static int add_mount(const char *what, const char *where, struct mntent *me) {
goto finish;
}
goto finish;
}
- mkdir_parents(lnk, 0755);
+ mkdir_parents
_label
(lnk, 0755);
if (symlink(unit, lnk) < 0) {
log_error("Failed to create symlink: %m");
r = -errno;
if (symlink(unit, lnk) < 0) {
log_error("Failed to create symlink: %m");
r = -errno;
@@
-352,7
+352,7
@@
static int add_mount(const char *what, const char *where, struct mntent *me) {
goto finish;
}
goto finish;
}
- mkdir_parents(lnk, 0755);
+ mkdir_parents
_label
(lnk, 0755);
if (symlink(unit, lnk) < 0) {
log_error("Failed to creat symlink: %m");
r = -errno;
if (symlink(unit, lnk) < 0) {
log_error("Failed to creat symlink: %m");
r = -errno;
@@
-413,7
+413,7
@@
static int add_mount(const char *what, const char *where, struct mntent *me) {
goto finish;
}
goto finish;
}
- mkdir_parents(lnk, 0755);
+ mkdir_parents
_label
(lnk, 0755);
if (symlink(automount_unit, lnk) < 0) {
log_error("Failed to create symlink: %m");
r = -errno;
if (symlink(automount_unit, lnk) < 0) {
log_error("Failed to create symlink: %m");
r = -errno;
@@
-470,9
+470,6
@@
static int parse_fstab(void) {
goto finish;
}
goto finish;
}
- if (is_path(what))
- path_kill_slashes(what);
-
if (is_path(where))
path_kill_slashes(where);
if (is_path(where))
path_kill_slashes(where);