diff options
| author | Karel Zak | 2012-02-28 00:02:30 +0100 |
|---|---|---|
| committer | Karel Zak | 2012-02-28 00:02:30 +0100 |
| commit | 772cce373f693096c2ae6f156306acf9e20c09e8 (patch) | |
| tree | 10717529b89a18bcafa4f9b6ea64ad21a7d11393 | |
| parent | libmount: use mount.<type> -s for NFS only (diff) | |
| download | kernel-qcow2-util-linux-772cce373f693096c2ae6f156306acf9e20c09e8.tar.gz kernel-qcow2-util-linux-772cce373f693096c2ae6f156306acf9e20c09e8.tar.xz kernel-qcow2-util-linux-772cce373f693096c2ae6f156306acf9e20c09e8.zip | |
libmount: allow empty source for mount(2) syscall
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=797438
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | libmount/src/context_mount.c | 4 | ||||
| -rw-r--r-- | sys-utils/mount.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c index a0c5951c1..098243b72 100644 --- a/libmount/src/context_mount.c +++ b/libmount/src/context_mount.c @@ -451,8 +451,10 @@ static int do_mount(struct libmnt_context *cxt, const char *try_type) src = mnt_fs_get_srcpath(cxt->fs); target = mnt_fs_get_target(cxt->fs); - if (!src || !target) + if (!target) return -EINVAL; + if (!src) + src = "none"; type = try_type ? : mnt_fs_get_fstype(cxt->fs); diff --git a/sys-utils/mount.c b/sys-utils/mount.c index 3fbac04a1..23abc9173 100644 --- a/sys-utils/mount.c +++ b/sys-utils/mount.c @@ -347,7 +347,11 @@ try_readonly: return MOUNT_EX_USAGE; } - if (src == NULL || tgt == NULL) { + /* + * TODO: add mnt_context_fstab_applied() to check if we found + * target/source in the file. + */ + if (!tgt) { if (mflags & MS_REMOUNT) warnx(_("%s not mounted"), src ? src : tgt); else |