From: Karel Zak <kzak@redhat.com>
Date: Wed, 15 Apr 2026 08:41:57 +0000 (+0200)
Subject: Merge branch 'unshare_clear_environ' of https://github.com/cgoesche/util-linux-fork
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db0458dba90730a0429d30e5f7f2ebcf4a59d772;p=thirdparty%2Futil-linux.git

Merge branch 'unshare_clear_environ' of https://github.com/cgoesche/util-linux-fork

* 'unshare_clear_environ' of https://github.com/cgoesche/util-linux-fork:
  nsenter: use clearenv() only when it is available
  tests: (unshare) add --clear-env option tests
  tests: (test_strerror.c) use ARRAY_SIZE for better readability/portability
  tests: (test_strerror.c) add EPERM errno support
  bash-completion: (unshare) add --clear-env option
  unshare: (manpage) fix minor typos
  unshare: new option to prevent environment variable inheritance

# Conflicts:
#	tests/helpers/test_strerror.c
---

db0458dba90730a0429d30e5f7f2ebcf4a59d772
diff --cc tests/helpers/test_strerror.c
index 322ce659be,3775a46a33..e0ad21e6d6
--- a/tests/helpers/test_strerror.c
+++ b/tests/helpers/test_strerror.c
@@@ -21,7 -24,7 +24,8 @@@ static struct 
  	E(ENOTTY),
  	E(EILSEQ),
  	E(EINVAL),
 +	E(ERANGE),
+ 	E(EPERM),
  };
  
  int main(int argc, const char *argv[])