X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=mount-setup.c;h=f3041941ac4326d070b1325a6a159c9f7da83cb2;hp=18d3911be45e9c8f7db174beccfaf6710b427691;hb=b9f49ee478fdc06c45092f208f1dddd23680ab13;hpb=061ea77d9e08444ebc8282204c8366f367ecc771

diff --git a/mount-setup.c b/mount-setup.c
index 18d3911be..f3041941a 100644
--- a/mount-setup.c
+++ b/mount-setup.c
@@ -29,6 +29,8 @@
 
 #include "mount-setup.h"
 #include "log.h"
+#include "macro.h"
+#include "util.h"
 
 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. */
-        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],
-                  t[MOUNT_OPTIONS]);
+                  strna(t[MOUNT_OPTIONS]));
 
         if (mount(t[MOUNT_WHAT],
                   t[MOUNT_WHERE],