Use libblkid to detect the filesystem type if "auto" is given as
type. Remove the translator localization from main, this is also done
in do_mount and any errors are propagated properly. This way "auto" is
handled correctly if given on the command line or used as filesystem
type in the fstab.
* utils/mount.c (DEFAULT_FSTYPE): Use "auto" as default type.
(do_mount): Detect type using libblkid.
(main): Drop translator localization.
---
utils/Makefile | 1 +
utils/mount.c | 27 +++++++++++++++++++--------
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/utils/Makefile b/utils/Makefile
index 8a998f3..5130ca0 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -38,6 +38,7 @@ LDLIBS += -lpthread
login-LDLIBS = -lutil $(LIBCRYPT)
addauth-LDLIBS = $(LIBCRYPT)
setauth-LDLIBS = $(LIBCRYPT)
+mount-LDLIBS = -lblkid
INSTALL-login-ops = -o root -m 4755
INSTALL-ids-ops = -o root -m 4755
diff --git a/utils/mount.c b/utils/mount.c
index c3e3475..dc9f658 100644
--- a/utils/mount.c
+++ b/utils/mount.c
@@ -28,9 +28,10 @@
#include <hurd/fsys.h>
#include <hurd/fshelp.h>
#include <hurd/paths.h>
+#include <blkid/blkid.h>
#define SEARCH_FMTS _HURD "%sfs\0" _HURD "%s"
-#define DEFAULT_FSTYPE "ext2"
+#define DEFAULT_FSTYPE "auto"
static char *fstype = DEFAULT_FSTYPE;
static char *device, *mountpoint;
@@ -381,6 +382,23 @@ do_mount (struct fs *fs, int remount)
return EBUSY;
}
+ if (strcmp (fs->mntent.mnt_type, "auto") == 0)
+ {
+ char *type =
+ blkid_get_tag_value (NULL, "TYPE", fs->mntent.mnt_fsname);
+ if (! type)
+ {
+ error (0, 0, "failed to detect file system type");
+ return EFTYPE;
+ }
+ else
+ {
+ fs->mntent.mnt_type = strdup (type);
+ if (! fs->mntent.mnt_type)
+ error (3, ENOMEM, "failed to allocate memory");
+ }
+ }
+
err = fs_type (fs, &type);
if (err)
{
@@ -622,13 +640,6 @@ main (int argc, char **argv)
mnt_opts: 0,
mnt_freq: 0, mnt_passno: 0
};
- struct fstype *fst;
-
- err = fstypes_get (fstab->types, fstype, &fst);
- if (err)
- error (106, err, "cannot initialize type %s", fstype);
- if (fst->program == 0)
- error (2, 0, "filesystem type %s not recognized", fstype);
err = fstab_add_mntent (fstab, &m, &fs);
if (err)
--
1.7.10.4
