X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmount.c;h=01fc2dffbbee3bbbe057b27511f5f98b675e9fd8;hb=bc0f8771f23dc3952bf4b06301dc842ba625a0f2;hp=921984c1c116a6446ed4bb6facad915b5ac4a87b;hpb=307e85efbb781ac609b6b3f905ff76b886ddd01e;p=elogind.git diff --git a/src/mount.c b/src/mount.c index 921984c1c..01fc2dffb 100644 --- a/src/mount.c +++ b/src/mount.c @@ -267,9 +267,12 @@ static int mount_verify(Mount *m) { char *e; assert(m); - if (UNIT(m)->meta.load_state != UNIT_LOADED) + if (m->meta.load_state != UNIT_LOADED) return 0; + if (!m->from_etc_fstab && !m->from_fragment && !m->from_proc_self_mountinfo) + return -ENOENT; + if (!(e = unit_name_from_path(m->where, ".mount"))) return -ENOMEM; @@ -933,7 +936,7 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) { case MOUNT_REMOUNTING_SIGKILL: case MOUNT_REMOUNTING_SIGTERM: - if (success && m->from_proc_self_mountinfo) + if (success) mount_enter_mounted(m, true); else if (m->from_proc_self_mountinfo) mount_enter_mounted(m, false);