[ptxdist] [PATCH 1/4] networkmanager: fix /usr merge leftover

[ptxdist] [PATCH 1/4] networkmanager: fix /usr merge leftover

[Roland Hieber]

Fixes: d27127994b1cb7e52917 (2017-01-11, "networkmanager: /usr merge")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 projectroot/etc/init.d/NetworkManager | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projectroot/etc/init.d/NetworkManager b/projectroot/etc/init.d/NetworkManager
index f76e011317c4..67256feae373 100644
--- a/projectroot/etc/init.d/NetworkManager
+++ b/projectroot/etc/init.d/NetworkManager
@@ -43,7 +43,7 @@ test -f /etc/default/NetworkManager && . /etc/default/NetworkManager
 #	Function that starts the daemon/service.
 #
 d_start() {
-	/lib/init/nm-unmanage.sh
+	/usr/lib/init/nm-unmanage.sh
 
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
 		--oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE
-- 
2.39.2

[ptxdist] [PATCH 2/4] udev-legacy: fix /usr merge leftover

[Roland Hieber]

Fixes: 69841205bc7e114c40cc (2017-01-09, "udev-legacy: /usr merge")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 projectroot/etc/init.d/udev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projectroot/etc/init.d/udev b/projectroot/etc/init.d/udev
index 0e4a880bbb3b..8992ffe29a1f 100644
--- a/projectroot/etc/init.d/udev
+++ b/projectroot/etc/init.d/udev
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 udev_root="/dev"
-udev_rules="/lib/udev/rules.d"
+udev_rules="/usr/lib/udev/rules.d"
 udev_log="err"
 
 # for new udevd
-- 
2.39.2

Re: [ptxdist] [APPLIED] udev-legacy: fix /usr merge leftover

[Michael Olbrich]

Thanks, applied as b31fbeb9088367cd7de45e13809e1659fc2b35f2.

Michael

[sent from post-receive hook]

On Sun, 24 Sep 2023 07:44:41 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Fixes: 69841205bc7e114c40cc (2017-01-09, "udev-legacy: /usr merge")
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20230917192604.751338-2-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/projectroot/etc/init.d/udev b/projectroot/etc/init.d/udev
> index 0e4a880bbb3b..8992ffe29a1f 100644
> --- a/projectroot/etc/init.d/udev
> +++ b/projectroot/etc/init.d/udev
> @@ -1,7 +1,7 @@
>  #!/bin/sh
>  
>  udev_root="/dev"
> -udev_rules="/lib/udev/rules.d"
> +udev_rules="/usr/lib/udev/rules.d"
>  udev_log="err"
>  
>  # for new udevd

[ptxdist] [PATCH 3/4] rc-once: fix /usr merge leftover

[Roland Hieber]

Fixes: e74c5e613d9e1a7e3813 (2017-01-09, "rc-once: /usr merge")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 projectroot/usr/lib/systemd/system/rc-once.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projectroot/usr/lib/systemd/system/rc-once.service b/projectroot/usr/lib/systemd/system/rc-once.service
index dde5d7210b03..a2a337587409 100644
--- a/projectroot/usr/lib/systemd/system/rc-once.service
+++ b/projectroot/usr/lib/systemd/system/rc-once.service
@@ -9,5 +9,5 @@ Before=system-update.target
 [Service]
 Type=oneshot
 RemainAfterExit=no
-ExecStart=/lib/systemd/systemd-rc-once
+ExecStart=/usr/lib/systemd/systemd-rc-once
 StandardOutput=journal+console
-- 
2.39.2

Re: [ptxdist] [APPLIED] rc-once: fix /usr merge leftover

[Michael Olbrich]

Thanks, applied as 7c3092be20646a783680c6ffec643f83eb5b862b.

Michael

[sent from post-receive hook]

On Sun, 24 Sep 2023 07:44:41 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Fixes: e74c5e613d9e1a7e3813 (2017-01-09, "rc-once: /usr merge")
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20230917192604.751338-3-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/projectroot/usr/lib/systemd/system/rc-once.service b/projectroot/usr/lib/systemd/system/rc-once.service
> index dde5d7210b03..a2a337587409 100644
> --- a/projectroot/usr/lib/systemd/system/rc-once.service
> +++ b/projectroot/usr/lib/systemd/system/rc-once.service
> @@ -9,5 +9,5 @@ Before=system-update.target
>  [Service]
>  Type=oneshot
>  RemainAfterExit=no
> -ExecStart=/lib/systemd/systemd-rc-once
> +ExecStart=/usr/lib/systemd/systemd-rc-once
>  StandardOutput=journal+console

[ptxdist] [PATCH 4/4] bootchart: fix /usr merge leftover

[Roland Hieber]

Fixes: eca5e27bdb57a64165dd (2017-01-11, "bootchart: /usr merge")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 projectroot/usr/sbin/bootchartd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projectroot/usr/sbin/bootchartd b/projectroot/usr/sbin/bootchartd
index 41b868510764..6cbd0c9dedae 100644
--- a/projectroot/usr/sbin/bootchartd
+++ b/projectroot/usr/sbin/bootchartd
@@ -32,8 +32,8 @@ mount proc /proc -t proc
 
 {
     mount -n -t tmpfs -o size=8M none "$LOG_DIR"
-    /lib/bootchart/collector ${HZ} "${LOG_DIR}"
-    /lib/bootchart/gather "${OUT_DIR}/bootchart.tgz" "${LOG_DIR}"
+    /usr/lib/bootchart/collector ${HZ} "${LOG_DIR}"
+    /usr/lib/bootchart/gather "${OUT_DIR}/bootchart.tgz" "${LOG_DIR}"
 } &
 
 # from kernel:/init/main.c
-- 
2.39.2

Re: [ptxdist] [APPLIED] bootchart: fix /usr merge leftover

[Michael Olbrich]

Thanks, applied as 42b5182752f0171bf120b0a3ec8decf2915dd54c.

Michael

[sent from post-receive hook]

On Sun, 24 Sep 2023 07:44:42 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Fixes: eca5e27bdb57a64165dd (2017-01-11, "bootchart: /usr merge")
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20230917192604.751338-4-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/projectroot/usr/sbin/bootchartd b/projectroot/usr/sbin/bootchartd
> index 41b868510764..6cbd0c9dedae 100644
> --- a/projectroot/usr/sbin/bootchartd
> +++ b/projectroot/usr/sbin/bootchartd
> @@ -32,8 +32,8 @@ mount proc /proc -t proc
>  
>  {
>      mount -n -t tmpfs -o size=8M none "$LOG_DIR"
> -    /lib/bootchart/collector ${HZ} "${LOG_DIR}"
> -    /lib/bootchart/gather "${OUT_DIR}/bootchart.tgz" "${LOG_DIR}"
> +    /usr/lib/bootchart/collector ${HZ} "${LOG_DIR}"
> +    /usr/lib/bootchart/gather "${OUT_DIR}/bootchart.tgz" "${LOG_DIR}"
>  } &
>  
>  # from kernel:/init/main.c

Re: [ptxdist] [APPLIED] networkmanager: fix /usr merge leftover

[Michael Olbrich]

Thanks, applied as c1b63f970d179ae5969f2486ea4cf42df2c02156.

Michael

[sent from post-receive hook]

On Sun, 24 Sep 2023 07:44:35 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Fixes: d27127994b1cb7e52917 (2017-01-11, "networkmanager: /usr merge")
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20230917192604.751338-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/projectroot/etc/init.d/NetworkManager b/projectroot/etc/init.d/NetworkManager
> index f76e011317c4..67256feae373 100644
> --- a/projectroot/etc/init.d/NetworkManager
> +++ b/projectroot/etc/init.d/NetworkManager
> @@ -43,7 +43,7 @@ test -f /etc/default/NetworkManager && . /etc/default/NetworkManager
>  #	Function that starts the daemon/service.
>  #
>  d_start() {
> -	/lib/init/nm-unmanage.sh
> +	/usr/lib/init/nm-unmanage.sh
>  
>  	start-stop-daemon --start --quiet --pidfile $PIDFILE \
>  		--oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE