diff options
Diffstat (limited to 'mount')
| -rw-r--r-- | mount/Makefile.am | 7 | ||||
| -rw-r--r-- | mount/fsprobe.h (renamed from mount/mount_blkid.h) | 0 | ||||
| -rw-r--r-- | mount/fsprobe_blkid.c (renamed from mount/mount_blkid.c) | 2 | ||||
| -rw-r--r-- | mount/fstab.c | 2 | ||||
| -rw-r--r-- | mount/mount.c | 2 | ||||
| -rw-r--r-- | mount/mount_guess_fstype.c | 2 | ||||
| -rw-r--r-- | mount/swapon.c | 2 |
7 files changed, 9 insertions, 8 deletions
diff --git a/mount/Makefile.am b/mount/Makefile.am index 1808930d..563c512c 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -7,11 +7,12 @@ sbin_PROGRAMS = losetup swapon man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8 MNTHDRS = fstab.h linux_fs.h mount_mntent.h mount_constants.h my_dev_t.h \ - mount_paths.h get_label_uuid.h lomount.h mount_blkid.h \ + mount_paths.h get_label_uuid.h lomount.h fsprobe.h \ mount_guess_fstype.h realpath.h xmalloc.h \ getusername.h loop.h mount_by_label.h sundries.h + mount_common = fstab.c sundries.c xmalloc.c realpath.c mount_mntent.c \ - getusername.c get_label_uuid.c mount_by_label.c mount_blkid.c \ + getusername.c get_label_uuid.c mount_by_label.c fsprobe_blkid.c \ lomount.c $(MNTHDRS) ../lib/env.c mount_SOURCES = mount.c $(mount_common) ../lib/setproctitle.c \ @@ -24,7 +25,7 @@ umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) swapon_SOURCES = swapon.c xmalloc.c \ - get_label_uuid.c mount_by_label.c mount_blkid.c \ + get_label_uuid.c mount_by_label.c fsprobe_blkid.c \ swap_constants.h realpath.c losetup_SOURCES = lomount.c loop.h lomount.h diff --git a/mount/mount_blkid.h b/mount/fsprobe.h index c96ff8cb..c96ff8cb 100644 --- a/mount/mount_blkid.h +++ b/mount/fsprobe.h diff --git a/mount/mount_blkid.c b/mount/fsprobe_blkid.c index 8fa30a1c..06169453 100644 --- a/mount/mount_blkid.c +++ b/mount/fsprobe_blkid.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include "mount_blkid.h" +#include "fsprobe.h" #ifdef HAVE_LIBBLKID diff --git a/mount/fstab.c b/mount/fstab.c index 72c46f36..5267f620 100644 --- a/mount/fstab.c +++ b/mount/fstab.c @@ -15,7 +15,7 @@ #include "fstab.h" #include "sundries.h" #include "xmalloc.h" -#include "mount_blkid.h" +#include "fsprobe.h" #include "mount_paths.h" #include "nls.h" diff --git a/mount/mount.c b/mount/mount.c index da210fb5..2668c402 100644 --- a/mount/mount.c +++ b/mount/mount.c @@ -29,7 +29,7 @@ #include <selinux/context.h> #endif -#include "mount_blkid.h" +#include "fsprobe.h" #include "mount_constants.h" #include "sundries.h" #include "xmalloc.h" diff --git a/mount/mount_guess_fstype.c b/mount/mount_guess_fstype.c index f1637f1e..51d87500 100644 --- a/mount/mount_guess_fstype.c +++ b/mount/mount_guess_fstype.c @@ -38,7 +38,7 @@ #include <sys/stat.h> #include <sys/types.h> #include "linux_fs.h" -#include "mount_blkid.h" +#include "fsprobe.h" #include "mount_guess_fstype.h" #include "sundries.h" /* for xstrdup */ #include "nls.h" diff --git a/mount/swapon.c b/mount/swapon.c index a6e6b509..c929a5af 100644 --- a/mount/swapon.c +++ b/mount/swapon.c @@ -14,7 +14,7 @@ #include "xmalloc.h" #include "swap_constants.h" #include "nls.h" -#include "mount_blkid.h" +#include "fsprobe.h" #include "mount_by_label.h" #include "realpath.h" |