From: Karel Zak <kzak@redhat.com>
Date: Tue, 2 Nov 2021 08:15:13 +0000 (+0100)
Subject: lsfd: remove unused --sysroot
X-Git-Tag: v2.38-rc1~144^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45c1eb21626ee6b0f68197b46306bb9099e75378;p=thirdparty%2Futil-linux.git

lsfd: remove unused --sysroot

It's unnecessary to redirect to any /proc dump if we can use 'test_mkfds'.

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

diff --git a/misc-utils/lsfd.1.adoc b/misc-utils/lsfd.1.adoc
index e6a72d302f..55f292d539 100644
--- a/misc-utils/lsfd.1.adoc
+++ b/misc-utils/lsfd.1.adoc
@@ -51,9 +51,6 @@ the format _+list_ (e.g., *lsfd -o +DELETED*).
 *-r*, *--raw*::
 Use raw output format.
 
-*--sysroot* _dir_::
-Use specified directory as system root.
-
 *--notruncate*::
 Don't truncate text in columns.
 
diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c
index 78e44b6e4f..fc721982e6 100644
--- a/misc-utils/lsfd.c
+++ b/misc-utils/lsfd.c
@@ -192,7 +192,6 @@ static size_t nspaces;
 struct lsfd_control {
 	struct libscols_table *tb;		/* output */
 	struct list_head procs;			/* list of all processes */
-	const char *sysroot;			/* default is NULL */
 
 	unsigned int	noheadings : 1,
 			raw : 1,
@@ -1041,7 +1040,6 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -n, --noheadings      don't print headings\n"), out);
 	fputs(_(" -o, --output <list>   output columns\n"), out);
 	fputs(_(" -r, --raw             use raw output format\n"), out);
-	fputs(_("     --sysroot <dir>   use specified directory as system root\n"), out);
 	fputs(_(" -u, --notruncate      don't truncate text in columns\n"), out);
 	fputs(_(" -p, --pid  <pid(s)>   collect information only specified processes\n"), out);
 	fputs(_(" -Q, --filter <expr>   apply display filter\n"), out);
@@ -1109,8 +1107,7 @@ int main(int argc, char *argv[])
 	int n_pids = 0;
 
 	enum {
-		OPT_SYSROOT = CHAR_MAX + 1,
-		OPT_DEBUG_FILTER,
+		OPT_DEBUG_FILTER = CHAR_MAX + 1
 	};
 	static const struct option longopts[] = {
 		{ "noheadings", no_argument, NULL, 'n' },
@@ -1121,7 +1118,6 @@ int main(int argc, char *argv[])
 		{ "raw",        no_argument, NULL, 'r' },
 		{ "threads",    no_argument, NULL, 'l' },
 		{ "notruncate", no_argument, NULL, 'u' },
-		{ "sysroot",    required_argument, NULL, OPT_SYSROOT },
 		{ "pid",        required_argument, NULL, 'p' },
 		{ "filter",     required_argument, NULL, 'Q' },
 		{ "debug-filter",no_argument, NULL, OPT_DEBUG_FILTER },
@@ -1153,9 +1149,6 @@ int main(int argc, char *argv[])
 		case 'u':
 			ctl.notrunc = 1;
 			break;
-		case OPT_SYSROOT:
-			ctl.sysroot = optarg;
-			break;
 		case 'p':
 			parse_pids(optarg, &pids, &n_pids);
 			break;