xfs_info: move to xfs_spaceman

Move xfs_info to be under spaceman so that we can remove growfs -N.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/growfs/Makefile b/growfs/Makefile
index f0190e4b75a04e33f5e1dca4a8cc304cf0909584..adcd84b48db964efd7ff2f631a62ea12d35045df 100644 (file)
--- a/growfs/Makefile
+++ b/growfs/Makefile
@@ -20,7 +20,6 @@ endif
 
 LTDEPENDENCIES = $(LIBXFS) $(LIBXCMD) $(LIBFROG)
 LLDFLAGS = -static-libtool-libs
-LSRCFILES = xfs_info.sh
 
 default: depend $(LTCOMMAND)
 
@@ -29,7 +28,6 @@ include $(BUILDRULES)
 install: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
-       $(INSTALL) -m 755 xfs_info.sh $(PKG_SBIN_DIR)/xfs_info
 install-dev:
 
 -include .dep

diff --git a/spaceman/Makefile b/spaceman/Makefile
index c1d903ba84d8d51e0ae3a0a6706d92c2411647e7..0d5ae2d1207c68b5102ba9eb5d1bc7c6e65043e2 100644 (file)
--- a/spaceman/Makefile
+++ b/spaceman/Makefile
@@ -8,6 +8,7 @@ include $(TOPDIR)/include/builddefs
 LTCOMMAND = xfs_spaceman
 HFILES = init.h space.h
 CFILES = info.c init.c file.c prealloc.c trim.c
+LSRCFILES = xfs_info.sh
 
 LLDLIBS = $(LIBXCMD) $(LIBFROG)
 LTDEPENDENCIES = $(LIBXCMD) $(LIBFROG)
@@ -35,6 +36,7 @@ include $(BUILDRULES)
 install: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
+       $(INSTALL) -m 755 xfs_info.sh $(PKG_SBIN_DIR)/xfs_info
 install-dev:
 
 -include .dep

diff --git a/spaceman/init.c b/spaceman/init.c
index 895504f31dd0175414802c3d9c737ec2ce9dd083..91c773ff80d3084da3b3903154b32af43e1631ca 100644 (file)
--- a/spaceman/init.c
+++ b/spaceman/init.c
@@ -81,11 +81,14 @@ init(
        textdomain(PACKAGE);
 
        fs_table_initialise(0, NULL, 0, NULL);
-       while ((c = getopt(argc, argv, "c:V")) != EOF) {
+       while ((c = getopt(argc, argv, "c:p:V")) != EOF) {
                switch (c) {
                case 'c':
                        add_user_command(optarg);
                        break;
+               case 'p':
+                       progname = optarg;
+                       break;
                case 'V':
                        printf(_("%s version %s\n"), progname, VERSION);
                        exit(0);

diff --git a/growfs/xfs_info.sh b/spaceman/xfs_info.sh
similarity index 83%
rename from growfs/xfs_info.sh
rename to spaceman/xfs_info.sh
index b85f120f3b3016f877cfc99b231165358ca421ec..5df0a2652d99a47ddba77ba2126912874656a3c1 100755 (executable)
--- a/growfs/xfs_info.sh
+++ b/spaceman/xfs_info.sh
@@ -10,7 +10,7 @@ while getopts "t:V" c
 do
        case $c in
        t)      OPTS="-t $OPTARG" ;;
-       V)      xfs_growfs -p xfs_info -V
+       V)      xfs_spaceman -p xfs_info -V
                status=$?
                exit $status
                ;;
@@ -22,7 +22,7 @@ done
 set -- extra "$@"
 shift $OPTIND
 case $# in
-       1)      xfs_growfs -p xfs_info -n $OPTS "$1"
+       1)      xfs_spaceman -p xfs_info -c "info" $OPTS "$1"
                status=$?
                ;;
        *)      echo $USAGE 1>&2