mount: fsprobe: rename files to fsprobe_*

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/mount/Makefile.am b/mount/Makefile.am
index 1808930de040135860f76a3b795a45c645cab3ae..563c512cad322f46bce896f213f54309f5b91413 100644 (file)
--- 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
similarity index 100%
rename from mount/mount_blkid.h
rename to mount/fsprobe.h

diff --git a/mount/mount_blkid.c b/mount/fsprobe_blkid.c
similarity index 98%
rename from mount/mount_blkid.c
rename to mount/fsprobe_blkid.c
index 8fa30a1cef90a560988d9d069301e248d1bf2de7..061694533c41f4b35d1bb7918c89d695c219fd26 100644 (file)
--- 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 72c46f3676692e3a595085c738669664450e14fa..5267f620b4658ceafe1f48ec58b2c768f2eae13c 100644 (file)
--- 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 da210fb5bc2dc93bbc26d9b4cbf83b5f7663417b..2668c402bd7d3e26e231cc66786e09f948d94c58 100644 (file)
--- 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 f1637f1e4b53b5ebf3c96c59a352c65ad360b60d..51d875008b842ee9d2f3f81e1f3f1016cd06961f 100644 (file)
--- 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 a6e6b509be67b4645b3108e3c6a4f96bb6ff74ed..c929a5af22bb6091958b902a6652f81ee96d0df5 100644 (file)
--- 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"