mount: don't fail if fstab doesn't exist

diff --git a/src/core/mount.c b/src/core/mount.c
index 760ffcdbf6e983542828e876fc3a4a9ef1bd67ee..dbd4893bcbdcafd05e89cf1dcf79f04a3504ed10 100644 (file)
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1537,8 +1537,9 @@ static int mount_load_etc_fstab(Manager *m) {
         assert(m);
 
         errno = 0;
         assert(m);
 
         errno = 0;

-        if (!(f = setmntent("/etc/fstab", "r")))
-                return -errno;
+        f = setmntent("/etc/fstab", "r");
+        if (!f)
+                return errno == ENOENT ? 0 : -errno;

 
         while ((me = getmntent(f))) {
                 char *where, *what;
 
         while ((me = getmntent(f))) {
                 char *where, *what;

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index f214d60d569fda55c0edadc0ab8359ca9c382666..3ff0ddf2cc8b2285e554e3fc264716e2ef369327 100644 (file)
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -190,7 +190,8 @@ static char *disk_mount_point(const char *label) {
         if (asprintf(&device, "/dev/mapper/%s", label) < 0)
                 goto finish;
 
         if (asprintf(&device, "/dev/mapper/%s", label) < 0)
                 goto finish;
 

-        if (!(f = setmntent("/etc/fstab", "r")))
+        f = setmntent("/etc/fstab", "r");
+        if (!f)

                 goto finish;
 
         while ((m = getmntent(f)))
                 goto finish;
 
         while ((m = getmntent(f)))

diff --git a/src/remount-api-vfs/remount-api-vfs.c b/src/remount-api-vfs/remount-api-vfs.c
index 6cb77c1d1a1ef02e9ab715ebdbf4de50c8729f20..373ae2552047287decc6251de9ca5aebc2b6726b 100644 (file)
--- a/src/remount-api-vfs/remount-api-vfs.c
+++ b/src/remount-api-vfs/remount-api-vfs.c
@@ -56,6 +56,11 @@ int main(int argc, char *argv[]) {
 
         f = setmntent("/etc/fstab", "r");
         if (!f) {
 
         f = setmntent("/etc/fstab", "r");
         if (!f) {

+                if (errno == ENOENT) {
+                        ret = EXIT_SUCCESS;
+                        goto finish;
+                }
+

                 log_error("Failed to open /etc/fstab: %m");
                 goto finish;
         }
                 log_error("Failed to open /etc/fstab: %m");
                 goto finish;
         }