From: Karel Zak <kzak@redhat.com>
Date: Wed, 19 Nov 2008 10:07:58 +0000 (+0100)
Subject: build-sys: move pivot_root(8) to sys-utils
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5947572d5e527b842210e67d07e53eed5d95fbb2;p=util-linux

build-sys: move pivot_root(8) to sys-utils

This patch moves pivot_root.{8,c) from mount/ to sys-utils/ directory.
There is not ant relation between pivot_root source code and the rest of
code in the mount.

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

diff --git a/mount/.gitignore b/mount/.gitignore
index 6de7afca..db657c71 100644
--- a/mount/.gitignore
+++ b/mount/.gitignore
@@ -1,6 +1,5 @@
 losetup
 mount
 mtab_lock_test
-pivot_root
 swapon
 umount
diff --git a/mount/Makefile.am b/mount/Makefile.am
index a43fcd5d..00882af3 100644
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@ -76,11 +76,6 @@ LDADD_common += $(VOLUMEID_LIBS)
 LDADD_common_static += $(VOLUMEID_LIBS_STATIC)
 endif
 
-if HAVE_PIVOT_ROOT
-sbin_PROGRAMS += pivot_root
-dist_man_MANS += pivot_root.8
-endif
-
 noinst_PROGRAMS = mtab_lock_test
 mtab_lock_test_SOURCES = fstab.c sundries.c xmalloc.c $(headers_common)
 mtab_lock_test_CPPFLAGS = -DMAIN_TEST_MTABLOCK $(AM_CPPFLAGS)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7187a887..e0564ac9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -72,7 +72,6 @@ mount/getusername.c
 mount/lomount.c
 mount/mount.c
 mount/mount_mntent.c
-mount/pivot_root.c
 mount/realpath.c
 mount/sundries.c
 mount/swapon.c
@@ -100,6 +99,7 @@ sys-utils/ipcrm.c
 sys-utils/ipcs.c
 sys-utils/ldattach.c
 sys-utils/lscpu.c
+sys-utils/pivot_root.c
 sys-utils/rdev.c
 sys-utils/readprofile.c
 sys-utils/renice.c
diff --git a/sys-utils/.gitignore b/sys-utils/.gitignore
index fb6e433b..c47cd077 100644
--- a/sys-utils/.gitignore
+++ b/sys-utils/.gitignore
@@ -1,40 +1,41 @@
+arch
 ctrlaltdel
 cytune
 dmesg
 flock
+i386.8
+ia64.8
+ipcmk
 ipcrm
 ipcs
-ipcmk
 ldattach
-readprofile
-renice
-rtcwake
-lscpu
-setarch
-setsid
-tunelp
-arch
-vidmode.8
-ramsize.8
-rdev
-i386.8
-ia64.8
 linux32.8
 linux64.8
+lscpu
 mips32.8
 mips64.8
 mips.8
 parisc32.8
 parisc64.8
 parisc.8
+pivot_root
 ppc32.8
 ppc64.8
 ppc.8
+ramsize.8
+rdev
+readprofile
+renice
 rootflags.8
+rtcwake
 s390.8
 s390x.8
+setarch
+setsid
 sparc32.8
 sparc32bash.8
 sparc64.8
 sparc.8
+tunelp
+vidmode.8
 x86_64.8
diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am
index 0dbbb482..b4c6ac60 100644
--- a/sys-utils/Makefile.am
+++ b/sys-utils/Makefile.am
@@ -23,6 +23,11 @@ tunelp_SOURCES = tunelp.c lp.h
 
 info_TEXINFOS = ipc.texi
 
+if HAVE_PIVOT_ROOT
+sbin_PROGRAMS += pivot_root
+dist_man_MANS += pivot_root.8
+endif
+
 if BUILD_ARCH
 bin_PROGRAMS += arch
 dist_man_MANS += arch.1
diff --git a/mount/pivot_root.8 b/sys-utils/pivot_root.8
similarity index 100%
rename from mount/pivot_root.8
rename to sys-utils/pivot_root.8
diff --git a/mount/pivot_root.c b/sys-utils/pivot_root.c
similarity index 100%
rename from mount/pivot_root.c
rename to sys-utils/pivot_root.c