From e5e589afd5a9d03a51ec4a557cf46b33069cf0ba Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Thu, 2 Jan 2025 13:35:19 +0100 Subject: [PATCH 1/2] chroot: remove short option "-G" --- src/uu/chroot/src/chroot.rs | 1 - tests/by-util/test_chroot.rs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/uu/chroot/src/chroot.rs b/src/uu/chroot/src/chroot.rs index 04db1380f..cc67704d8 100644 --- a/src/uu/chroot/src/chroot.rs +++ b/src/uu/chroot/src/chroot.rs @@ -192,7 +192,6 @@ pub fn uu_app() -> Command { ) .arg( Arg::new(options::GROUPS) - .short('G') .long(options::GROUPS) .help("Comma-separated list of groups to switch to") .value_name("GROUP1,GROUP2..."), diff --git a/tests/by-util/test_chroot.rs b/tests/by-util/test_chroot.rs index 31facdd55..711dd0943 100644 --- a/tests/by-util/test_chroot.rs +++ b/tests/by-util/test_chroot.rs @@ -141,7 +141,7 @@ fn test_preference_of_userspec() { .arg("a") .arg("--user") .arg("fake") - .arg("-G") + .arg("--groups") .arg("ABC,DEF") .arg(format!("--userspec={username}:{group_name}")) .fails(); From e22bcbb74dd9782beaeddeefd4699456506ecc6a Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Thu, 2 Jan 2025 13:38:39 +0100 Subject: [PATCH 2/2] chroot: remove outdated info from help --- src/uu/chroot/src/chroot.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/uu/chroot/src/chroot.rs b/src/uu/chroot/src/chroot.rs index cc67704d8..81c530dd8 100644 --- a/src/uu/chroot/src/chroot.rs +++ b/src/uu/chroot/src/chroot.rs @@ -199,11 +199,7 @@ pub fn uu_app() -> Command { .arg( Arg::new(options::USERSPEC) .long(options::USERSPEC) - .help( - "Colon-separated user and group to switch to. \ - Same as -u USER -g GROUP. \ - Userspec has higher preference than -u and/or -g", - ) + .help("Colon-separated user and group to switch to.") .value_name("USER:GROUP"), ) .arg(