summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Koenig2007-08-24 13:05:27 +0200
committerKarel Zak2007-08-24 15:07:39 +0200
commit309fd2e79370be77c192ec272657aef9a5320ffb (patch)
tree99b025dd588fbaea42fcdd1e763af4643a3903ac
parentsetarch: cleanup licensing note (diff)
downloadkernel-qcow2-util-linux-309fd2e79370be77c192ec272657aef9a5320ffb.tar.gz
kernel-qcow2-util-linux-309fd2e79370be77c192ec272657aef9a5320ffb.tar.xz
kernel-qcow2-util-linux-309fd2e79370be77c192ec272657aef9a5320ffb.zip
mount: avoid duplicates for root fs in mtab
If the root fs is defined with LABEL or UUID in fstab, avoid a duplicate entry in mtab when calling mount without existing mtab. A mount -f / creates two entries, one for LABEL and another for the devicename, because canonicalize does not expand the LABEL or UUID tags. Signed-off-by: Matthias Koenig <mkoenig@suse.de>
-rw-r--r--mount/mount.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mount/mount.c b/mount/mount.c
index 83d55e0c6..40699f33d 100644
--- a/mount/mount.c
+++ b/mount/mount.c
@@ -541,7 +541,7 @@ create_mtab (void) {
char *extra_opts;
parse_opts (fstab->m.mnt_opts, &flags, &extra_opts);
mnt.mnt_dir = "/";
- mnt.mnt_fsname = canonicalize (fstab->m.mnt_fsname);
+ mnt.mnt_fsname = fsprobe_get_devname(fstab->m.mnt_fsname);
mnt.mnt_type = fstab->m.mnt_type;
mnt.mnt_opts = fix_opts_string (flags, extra_opts, NULL);
mnt.mnt_freq = mnt.mnt_passno = 0;