Re: [ptxdist] [PATCH] bbinit: Remove /bin and /sbin from PATH after /usr merge

2023-06-23 Thread Michael Olbrich 
On Wed, Jun 07, 2023 at 11:10:40AM +0200, Alexander Dahl wrote:
> The so called /usr merge was done back with ptxdist-2017.05.0 and since
> then /bin is just a symlink to /usr/bin and /sbin just a symlink to
> /usr/sbin.  Putting /bin _and_ /usr/bin to PATH would actually put the
> same directory twice to PATH.
> 
> Signed-off-by: Alexander Dahl 
> ---
> 
> Notes:
> Not sure if this should have been RFC first?  This does not affect
> PATH set by /etc/profile on login and there are more scripts outside
> of /etc/init.d which set a PATH.

It's better than before, so I applied it. I'm not sure why my git hook did
not notice that and send an email.

Michael

>  projectroot/etc/init.d/NetworkManager | 2 +-
>  projectroot/etc/init.d/atd| 2 +-
>  projectroot/etc/init.d/avahi-daemon   | 2 +-
>  projectroot/etc/init.d/chrony | 2 +-
>  projectroot/etc/init.d/dropbear   | 2 +-
>  projectroot/etc/init.d/haveged| 2 +-
>  projectroot/etc/init.d/inetd  | 2 +-
>  projectroot/etc/init.d/lighttpd   | 2 +-
>  projectroot/etc/init.d/lldpd  | 2 +-
>  projectroot/etc/init.d/monit  | 2 +-
>  projectroot/etc/init.d/nftables   | 2 +-
>  projectroot/etc/init.d/ntp-client | 2 +-
>  projectroot/etc/init.d/ntp-server | 2 +-
>  projectroot/etc/init.d/openssh| 2 +-
>  projectroot/etc/init.d/proftpd| 2 +-
>  projectroot/etc/init.d/pureftpd   | 2 +-
>  projectroot/etc/init.d/rc-once| 2 +-
>  projectroot/etc/init.d/samba  | 2 +-
>  projectroot/etc/init.d/sysctl | 2 +-
>  projectroot/etc/init.d/zeroconf   | 2 +-
>  20 files changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/projectroot/etc/init.d/NetworkManager 
> b/projectroot/etc/init.d/NetworkManager
> index 50a5467ad..f76e01131 100644
> --- a/projectroot/etc/init.d/NetworkManager
> +++ b/projectroot/etc/init.d/NetworkManager
> @@ -19,7 +19,7 @@ exec_prefix=/usr
>  sbindir=${exec_prefix}/sbin
>  localstatedir=/var
>  
> -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
> +PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
>  DESC="network connection manager"
>  NAME="NetworkManager"
>  
> diff --git a/projectroot/etc/init.d/atd b/projectroot/etc/init.d/atd
> index 7253f646c..62bfef811 100644
> --- a/projectroot/etc/init.d/atd
> +++ b/projectroot/etc/init.d/atd
> @@ -3,7 +3,7 @@
>  #
>  # atd
>  #
> -PATH=/usr/bin:/usr/sbin:/bin:/sbin
> +PATH=/usr/bin:/usr/sbin
>  
>  PREFIX="atd: "
>  ATD="/usr/sbin/atd"
> diff --git a/projectroot/etc/init.d/avahi-daemon 
> b/projectroot/etc/init.d/avahi-daemon
> index 27c22cc52..7aadb7525 100644
> --- a/projectroot/etc/init.d/avahi-daemon
> +++ b/projectroot/etc/init.d/avahi-daemon
> @@ -4,7 +4,7 @@
>  # Mi 22. Jul 21:46:28 CEST 2009
>  
>  #set -e
> -PATH=/sbin:/bin:/usr/bin
> +PATH=/usr/sbin:/usr/bin
>  BINARY=/usr/sbin/avahi-daemon
>  OPTIONS="-D"
>  
> diff --git a/projectroot/etc/init.d/chrony b/projectroot/etc/init.d/chrony
> index d112927f8..a40e2e621 100644
> --- a/projectroot/etc/init.d/chrony
> +++ b/projectroot/etc/init.d/chrony
> @@ -7,7 +7,7 @@
>  # Last change:  Bj?rn B?rger 
>  # Date:  Tue Mar  6 16:00:30 UTC 2007
>  
> -PATH=/sbin:/bin:/usr/bin:/usr/sbin
> +PATH=/usr/sbin:/usr/bin
>  BINARY="/usr/sbin/chronyd"
>  CONFIG="/etc/chrony/chrony.conf"
>  PREFIX="chrony: "
> diff --git a/projectroot/etc/init.d/dropbear b/projectroot/etc/init.d/dropbear
> index 1b16de20a..bec330ab2 100644
> --- a/projectroot/etc/init.d/dropbear
> +++ b/projectroot/etc/init.d/dropbear
> @@ -1,6 +1,6 @@
>  #!/bin/sh
>  
> -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
> +PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
>  DAEMON=/usr/sbin/dropbear
>  NAME=dropbear
>  
> diff --git a/projectroot/etc/init.d/haveged b/projectroot/etc/init.d/haveged
> index 1a4fc62a2..14e391320 100755
> --- a/projectroot/etc/init.d/haveged
> +++ b/projectroot/etc/init.d/haveged
> @@ -1,6 +1,6 @@
>  #!/bin/sh
>  
> -PATH='/sbin:/usr/sbin:/bin:/usr/bin'
> +PATH='/usr/sbin:/usr/bin'
>  DESC='haveged entropy daemon'
>  NAME='haveged'
>  DAEMON="/usr/sbin/$NAME"
> diff --git a/projectroot/etc/init.d/inetd b/projectroot/etc/init.d/inetd
> index 128d41a82..8fb10d994 100644
> --- a/projectroot/etc/init.d/inetd
> +++ b/projectroot/etc/init.d/inetd
> @@ -3,7 +3,7 @@
>  # This is an inetd init.d script which ist called by init(1) with 
> [start|stop] as argument
>  #
>  
> -PATH=/sbin:/bin:/usr/bin
> +PATH=/usr/sbin:/usr/bin
>  BINARY=/usr/sbin/inetd
>  
>  # --- nothing to change after this line ---
> diff --git a/projectroot/etc/init.d/lighttpd b/projectroot/etc/init.d/lighttpd
> index 24a17e2a0..e1b17c984 100644
> --- a/projectroot/etc/init.d/lighttpd
> +++ b/projectroot/etc/init.d/lighttpd
> @@ -3,7 +3,7 @@
>  #
>  # lighttpd
>  #
> -PATH=/usr/bin:/usr/sbin:/bin:/sbin
> +PATH=/usr/bin:/usr/sbin
>  
>  PREFIX="lighttpd: "
>  LIGHTTPD="/usr/sbin/lighttpd"
> diff --git

[ptxdist] [PATCH] bbinit: Remove /bin and /sbin from PATH after /usr merge

2023-06-07 Thread Alexander Dahl 
The so called /usr merge was done back with ptxdist-2017.05.0 and since
then /bin is just a symlink to /usr/bin and /sbin just a symlink to
/usr/sbin.  Putting /bin _and_ /usr/bin to PATH would actually put the
same directory twice to PATH.

Signed-off-by: Alexander Dahl 
---

Notes:
Not sure if this should have been RFC first?  This does not affect
PATH set by /etc/profile on login and there are more scripts outside
of /etc/init.d which set a PATH.

 projectroot/etc/init.d/NetworkManager | 2 +-
 projectroot/etc/init.d/atd| 2 +-
 projectroot/etc/init.d/avahi-daemon   | 2 +-
 projectroot/etc/init.d/chrony | 2 +-
 projectroot/etc/init.d/dropbear   | 2 +-
 projectroot/etc/init.d/haveged| 2 +-
 projectroot/etc/init.d/inetd  | 2 +-
 projectroot/etc/init.d/lighttpd   | 2 +-
 projectroot/etc/init.d/lldpd  | 2 +-
 projectroot/etc/init.d/monit  | 2 +-
 projectroot/etc/init.d/nftables   | 2 +-
 projectroot/etc/init.d/ntp-client | 2 +-
 projectroot/etc/init.d/ntp-server | 2 +-
 projectroot/etc/init.d/openssh| 2 +-
 projectroot/etc/init.d/proftpd| 2 +-
 projectroot/etc/init.d/pureftpd   | 2 +-
 projectroot/etc/init.d/rc-once| 2 +-
 projectroot/etc/init.d/samba  | 2 +-
 projectroot/etc/init.d/sysctl | 2 +-
 projectroot/etc/init.d/zeroconf   | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/projectroot/etc/init.d/NetworkManager 
b/projectroot/etc/init.d/NetworkManager
index 50a5467ad..f76e01131 100644
--- a/projectroot/etc/init.d/NetworkManager
+++ b/projectroot/etc/init.d/NetworkManager
@@ -19,7 +19,7 @@ exec_prefix=/usr
 sbindir=${exec_prefix}/sbin
 localstatedir=/var
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
 DESC="network connection manager"
 NAME="NetworkManager"
 
diff --git a/projectroot/etc/init.d/atd b/projectroot/etc/init.d/atd
index 7253f646c..62bfef811 100644
--- a/projectroot/etc/init.d/atd
+++ b/projectroot/etc/init.d/atd
@@ -3,7 +3,7 @@
 #
 # atd
 #
-PATH=/usr/bin:/usr/sbin:/bin:/sbin
+PATH=/usr/bin:/usr/sbin
 
 PREFIX="atd: "
 ATD="/usr/sbin/atd"
diff --git a/projectroot/etc/init.d/avahi-daemon 
b/projectroot/etc/init.d/avahi-daemon
index 27c22cc52..7aadb7525 100644
--- a/projectroot/etc/init.d/avahi-daemon
+++ b/projectroot/etc/init.d/avahi-daemon
@@ -4,7 +4,7 @@
 # Mi 22. Jul 21:46:28 CEST 2009
 
 #set -e
-PATH=/sbin:/bin:/usr/bin
+PATH=/usr/sbin:/usr/bin
 BINARY=/usr/sbin/avahi-daemon
 OPTIONS="-D"
 
diff --git a/projectroot/etc/init.d/chrony b/projectroot/etc/init.d/chrony
index d112927f8..a40e2e621 100644
--- a/projectroot/etc/init.d/chrony
+++ b/projectroot/etc/init.d/chrony
@@ -7,7 +7,7 @@
 # Last change:  Bj�rn B�rger 
 # Date:Tue Mar  6 16:00:30 UTC 2007
 
-PATH=/sbin:/bin:/usr/bin:/usr/sbin
+PATH=/usr/sbin:/usr/bin
 BINARY="/usr/sbin/chronyd"
 CONFIG="/etc/chrony/chrony.conf"
 PREFIX="chrony: "
diff --git a/projectroot/etc/init.d/dropbear b/projectroot/etc/init.d/dropbear
index 1b16de20a..bec330ab2 100644
--- a/projectroot/etc/init.d/dropbear
+++ b/projectroot/etc/init.d/dropbear
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/dropbear
 NAME=dropbear
 
diff --git a/projectroot/etc/init.d/haveged b/projectroot/etc/init.d/haveged
index 1a4fc62a2..14e391320 100755
--- a/projectroot/etc/init.d/haveged
+++ b/projectroot/etc/init.d/haveged
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PATH='/sbin:/usr/sbin:/bin:/usr/bin'
+PATH='/usr/sbin:/usr/bin'
 DESC='haveged entropy daemon'
 NAME='haveged'
 DAEMON="/usr/sbin/$NAME"
diff --git a/projectroot/etc/init.d/inetd b/projectroot/etc/init.d/inetd
index 128d41a82..8fb10d994 100644
--- a/projectroot/etc/init.d/inetd
+++ b/projectroot/etc/init.d/inetd
@@ -3,7 +3,7 @@
 # This is an inetd init.d script which ist called by init(1) with [start|stop] 
as argument
 #
 
-PATH=/sbin:/bin:/usr/bin
+PATH=/usr/sbin:/usr/bin
 BINARY=/usr/sbin/inetd
 
 # --- nothing to change after this line ---
diff --git a/projectroot/etc/init.d/lighttpd b/projectroot/etc/init.d/lighttpd
index 24a17e2a0..e1b17c984 100644
--- a/projectroot/etc/init.d/lighttpd
+++ b/projectroot/etc/init.d/lighttpd
@@ -3,7 +3,7 @@
 #
 # lighttpd
 #
-PATH=/usr/bin:/usr/sbin:/bin:/sbin
+PATH=/usr/bin:/usr/sbin
 
 PREFIX="lighttpd: "
 LIGHTTPD="/usr/sbin/lighttpd"
diff --git a/projectroot/etc/init.d/lldpd b/projectroot/etc/init.d/lldpd
index 00c8240f5..a592730fb 100755
--- a/projectroot/etc/init.d/lldpd
+++ b/projectroot/etc/init.d/lldpd
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
+PATH=/usr/sbin:/usr/bin
 DESC="LLDP daemon"
 NAME=lldpd
 DAEMON=/usr/sbin/$NAME
diff --git a/projectroot/etc/init.d/monit b/projectroot/etc/init.d/monit
index 96ec86ab9..c27543204 100644
--- a/projectroot/etc/init.d/monit
+++ b/projectroot/etc/init.d/monit