diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2013-09-02 10:55:24 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-09-09 09:52:32 +0200 |
| commit | 96f54b8bc892bc6feee6b9a3878b23e8dcbb2004 (patch) | |
| tree | 7c2e2a41edf3255ce0c0b474052a7316b8f42654 /utils/Makefile | |
| parent | c3a70032aa37e72adea05f03f5f8555e0991b560 (diff) | |
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.
Diffstat (limited to 'utils/Makefile')
| -rw-r--r-- | utils/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
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 |