From: Karel Zak <kzak@redhat.com>
Date: Wed, 9 May 2007 13:38:16 +0000 (+0200)
Subject: mount: fsprobe: rename files to fsprobe_*
X-Git-Tag: v2.13-rc1~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0964afe10d3c1f3856fa523fa7f164fd8ecc001d;p=thirdparty%2Futil-linux.git

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 1808930de0..563c512cad 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
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 8fa30a1cef..061694533c 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 72c46f3676..5267f620b4 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 da210fb5bc..2668c402bd 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 f1637f1e4b..51d875008b 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 a6e6b509be..c929a5af22 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"