From: Karel Zak <kzak@redhat.com>
Date: Tue, 6 Mar 2012 11:36:03 +0000 (+0100)
Subject: fsck: move to disk-utils directory
X-Git-Tag: v2.22-rc1~622
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7b585eac373f2b4322569b4c5deba0c4778c220;p=thirdparty%2Futil-linux.git

fsck: move to disk-utils directory

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

diff --git a/Makefile.am b/Makefile.am
index 9ba890b88e..9ac1ffc274 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,10 +48,6 @@ if BUILD_MOUNT
 SUBDIRS += mount
 endif
 
-if BUILD_FSCK
-SUBDIRS += fsck
-endif
-
 if BUILD_SCHEDUTILS
 SUBDIRS += schedutils
 endif
diff --git a/configure.ac b/configure.ac
index 0ae5b767d5..2140bc596a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -744,7 +744,7 @@ AC_ARG_ENABLE([fsck],
   [], enable_fsck=check
 )
 UL_BUILD_INIT([fsck])
-UL_REQUIRES_BUILD([fsck], [libblkid])
+UL_REQUIRES_BUILD([fsck], [libmount])
 AM_CONDITIONAL(BUILD_FSCK, test "x$build_fsck" = xyes)
 
 
@@ -1196,7 +1196,6 @@ AC_CONFIG_FILES([
 Makefile
 disk-utils/Makefile
 fdisk/Makefile
-fsck/Makefile
 getopt/Makefile
 hwclock/Makefile
 include/Makefile
diff --git a/disk-utils/.gitignore b/disk-utils/.gitignore
index c97b3421a0..dd6d37b70d 100644
--- a/disk-utils/.gitignore
+++ b/disk-utils/.gitignore
@@ -1,13 +1,14 @@
 blockdev
+elvtune
 fdformat
+fsck
 fsck.cramfs
 fsck.minix
 isosize
 mkfs
 mkfs.bfs
+mkfs.cramfs
 mkfs.minix
 mkswap
-mkfs.cramfs
-elvtune
 raw
 swaplabel
diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index 86412ada4f..09dfa994d1 100644
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -64,6 +64,14 @@ usrsbin_exec_PROGRAMS += fdformat
 blockdev_SOURCES = blockdev.c $(utils_common)
 endif
 
+if BUILD_FSCK
+sbin_PROGRAMS += fsck
+dist_man_MANS += fsck.8
+fsck_SOURCES = fsck.c
+fsck_LDADD = $(ul_libmount_la) $(ul_libblkid_la)
+fsck_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -I$(ul_libblkid_incdir)
+endif
+
 if BUILD_LIBBLKID
 sbin_PROGRAMS += swaplabel
 dist_man_MANS += swaplabel.8
diff --git a/fsck/fsck.8 b/disk-utils/fsck.8
similarity index 100%
rename from fsck/fsck.8
rename to disk-utils/fsck.8
diff --git a/fsck/fsck.c b/disk-utils/fsck.c
similarity index 99%
rename from fsck/fsck.c
rename to disk-utils/fsck.c
index 9f536675e5..b0063261ff 100644
--- a/fsck/fsck.c
+++ b/disk-utils/fsck.c
@@ -1511,4 +1511,3 @@ int main(int argc, char *argv[])
 	mnt_free_table(mtab);
 	return status;
 }
-
diff --git a/fsck/.gitignore b/fsck/.gitignore
deleted file mode 100644
index 559b9b0749..0000000000
--- a/fsck/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-fsck
diff --git a/fsck/Makefile.am b/fsck/Makefile.am
deleted file mode 100644
index e9fe4578c3..0000000000
--- a/fsck/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-sbin_PROGRAMS = fsck
-dist_man_MANS = fsck.8
-
-fsck_SOURCES = fsck.c
-fsck_LDADD = $(ul_libmount_la) $(ul_libblkid_la)
-fsck_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -I$(ul_libblkid_incdir)