chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dbus: make data pointer for properties read-only
[elogind.git]
/
mount-setup.c
diff --git
a/mount-setup.c
b/mount-setup.c
index 18d3911be45e9c8f7db174beccfaf6710b427691..f3041941ac4326d070b1325a6a159c9f7da83cb2 100644
(file)
--- a/
mount-setup.c
+++ b/
mount-setup.c
@@
-29,6
+29,8
@@
#include "mount-setup.h"
#include "log.h"
#include "mount-setup.h"
#include "log.h"
+#include "macro.h"
+#include "util.h"
enum {
MOUNT_WHAT,
enum {
MOUNT_WHAT,
@@
-88,13
+90,13
@@
static int mount_one(const char *t[]) {
/* The access mode here doesn't really matter too much, since
* the mounted file system will take precedence anyway. */
/* The access mode here doesn't really matter too much, since
* the mounted file system will take precedence anyway. */
- mkdir(t[MOUNT_WHERE], 0755);
+ mkdir
_p
(t[MOUNT_WHERE], 0755);
log_debug("Mounting %s to %s of type %s with options %s.",
t[MOUNT_WHAT],
t[MOUNT_WHERE],
t[MOUNT_TYPE],
log_debug("Mounting %s to %s of type %s with options %s.",
t[MOUNT_WHAT],
t[MOUNT_WHERE],
t[MOUNT_TYPE],
-
t[MOUNT_OPTIONS]
);
+
strna(t[MOUNT_OPTIONS])
);
if (mount(t[MOUNT_WHAT],
t[MOUNT_WHERE],
if (mount(t[MOUNT_WHAT],
t[MOUNT_WHERE],