From 96f54b8bc892bc6feee6b9a3878b23e8dcbb2004 Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Mon, 2 Sep 2013 10:55:24 +0200
Subject: mount: handle -t auto

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.

* configure.ac: Add check for libblkid.
* config.make.in: Make libblkid specific values available.
* utils/Makefile: Use libblkid specific values.
* utils/mount.c (DEFAULT_FSTYPE): Use "auto" as default type.
(do_mount): Detect type using libblkid.
(main): Drop translator localization.
---
 utils/Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'utils/Makefile')

diff --git a/utils/Makefile b/utils/Makefile
index 8e8591f7..acc8a700 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -39,6 +39,8 @@ LDLIBS += -lpthread
 login-LDLIBS = -lutil $(LIBCRYPT)
 addauth-LDLIBS = $(LIBCRYPT)
 setauth-LDLIBS = $(LIBCRYPT)
+mount-LDLIBS = $(libblkid-LIBS)
+mount-CPPFLAGS = $(libblkid-CFLAGS)
 
 INSTALL-login-ops = -o root -m 4755
 INSTALL-ids-ops = -o root -m 4755
-- 
cgit v1.2.3