File xfsprogs-xfs_info-move-to-xfs_spaceman.patch of Package xfsprogs.13989

Overview Repositories Revisions Requests Users Attributes Meta

File xfsprogs-xfs_info-move-to-xfs_spaceman.patch of Package xfsprogs.13989

From 3fda24ed019e3c49d10519e9c3aadcc2f5e624ed Mon Sep 17 00:00:00 2001
From: "Darrick J. Wong" <darrick.wong@oracle.com>
Date: Wed, 23 May 2018 16:30:48 -0500
Subject: [PATCH] xfs_info: move to xfs_spaceman
Git-commit: 3fda24ed019e3c49d10519e9c3aadcc2f5e624ed
Patch-mainline: v4.17.0-rc1
References: bsc#1129859

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>
Acked-by: Anthony Iliopoulos <ailiopoulos@suse.com>

---
 growfs/Makefile                  | 2 --
 spaceman/Makefile                | 2 ++
 spaceman/init.c                  | 5 ++++-
 {growfs => spaceman}/xfs_info.sh | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)
 rename {growfs => spaceman}/xfs_info.sh (83%)

diff --git a/growfs/Makefile b/growfs/Makefile
index f0190e4b..adcd84b4 100644
--- 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 c1d903ba..0d5ae2d1 100644
--- 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 895504f3..91c773ff 100644
--- 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 b85f120f..5df0a265 100755
--- 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
-- 
2.16.4

Places

File xfsprogs-xfs_info-move-to-xfs_spaceman.patch of Package xfsprogs.13989

Places