diff options
| author | Karel Zak | 2012-03-06 12:36:03 +0100 |
|---|---|---|
| committer | Karel Zak | 2012-03-20 11:22:09 +0100 |
| commit | a7b585eac373f2b4322569b4c5deba0c4778c220 (patch) | |
| tree | 148e8e3ec5cc2cfc50324a9ece5a96c3294fddb3 | |
| parent | fsck: coding stype fixes (calloc, err, ...) (diff) | |
| download | kernel-qcow2-util-linux-a7b585eac373f2b4322569b4c5deba0c4778c220.tar.gz kernel-qcow2-util-linux-a7b585eac373f2b4322569b4c5deba0c4778c220.tar.xz kernel-qcow2-util-linux-a7b585eac373f2b4322569b4c5deba0c4778c220.zip | |
fsck: move to disk-utils directory
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | disk-utils/.gitignore | 5 | ||||
| -rw-r--r-- | disk-utils/Makefile.am | 8 | ||||
| -rw-r--r-- | disk-utils/fsck.8 (renamed from fsck/fsck.8) | 0 | ||||
| -rw-r--r-- | disk-utils/fsck.c (renamed from fsck/fsck.c) | 1 | ||||
| -rw-r--r-- | fsck/.gitignore | 1 | ||||
| -rw-r--r-- | fsck/Makefile.am | 8 |
8 files changed, 12 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index 9ba890b88..9ac1ffc27 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 0ae5b767d..2140bc596 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 c97b3421a..dd6d37b70 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 86412ada4..09dfa994d 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 index d360df147..d360df147 100644 --- a/fsck/fsck.8 +++ b/disk-utils/fsck.8 diff --git a/fsck/fsck.c b/disk-utils/fsck.c index 9f536675e..b0063261f 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 559b9b074..000000000 --- a/fsck/.gitignore +++ /dev/null @@ -1 +0,0 @@ -fsck diff --git a/fsck/Makefile.am b/fsck/Makefile.am deleted file mode 100644 index e9fe4578c..000000000 --- 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) |