From fa1cece60f5316e2494bd9b1c504121e31c9ad22 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Wed, 7 Aug 2024 18:11:45 +0200 Subject: [PATCH] Follow-up to 2194f7be: migrate /libexec to /usr/libexec For consistency with the / + /usr merge, see 2194f7be, let's move the last remnants in /: /libexec/infix to /usr/libexec/infix Signed-off-by: Joachim Wiberg --- board/aarch64/cn9130-crb/README.md | 4 ++-- board/common/rootfs/etc/finit.d/10-infix.conf | 2 +- board/common/rootfs/etc/finit.d/available/mkcert.conf | 2 +- board/common/rootfs/etc/fstab | 4 ++-- board/common/rootfs/etc/udev/rules.d/90-media-mount.rules | 8 ++++---- .../common/rootfs/{ => usr}/libexec/infix/init.d/00-probe | 0 .../rootfs/{ => usr}/libexec/infix/init.d/05-product | 0 .../{ => usr}/libexec/infix/init.d/10-sysctl-sync-ip-conf | 0 .../rootfs/{ => usr}/libexec/infix/init.d/20-nameif | 0 .../rootfs/{ => usr}/libexec/infix/init.d/25-mqprio | 0 .../rootfs/{ => usr}/libexec/infix/init.d/30-cfg-migrate | 0 .../common/rootfs/{ => usr}/libexec/infix/init.d/99-done | 0 board/common/rootfs/{ => usr}/libexec/infix/media | 0 board/common/rootfs/{ => usr}/libexec/infix/mkcert | 0 board/common/rootfs/{ => usr}/libexec/infix/mkkeys | 0 board/common/rootfs/{ => usr}/libexec/infix/mnt | 4 ++-- board/common/rootfs/{ => usr}/libexec/infix/prod/fdisk | 0 .../common/rootfs/{ => usr}/libexec/infix/prod/provision | 2 +- src/confd/src/ietf-keystore.c | 2 +- 19 files changed, 14 insertions(+), 14 deletions(-) rename board/common/rootfs/{ => usr}/libexec/infix/init.d/00-probe (100%) rename board/common/rootfs/{ => usr}/libexec/infix/init.d/05-product (100%) rename board/common/rootfs/{ => usr}/libexec/infix/init.d/10-sysctl-sync-ip-conf (100%) rename board/common/rootfs/{ => usr}/libexec/infix/init.d/20-nameif (100%) rename board/common/rootfs/{ => usr}/libexec/infix/init.d/25-mqprio (100%) rename board/common/rootfs/{ => usr}/libexec/infix/init.d/30-cfg-migrate (100%) rename board/common/rootfs/{ => usr}/libexec/infix/init.d/99-done (100%) rename board/common/rootfs/{ => usr}/libexec/infix/media (100%) rename board/common/rootfs/{ => usr}/libexec/infix/mkcert (100%) rename board/common/rootfs/{ => usr}/libexec/infix/mkkeys (100%) rename board/common/rootfs/{ => usr}/libexec/infix/mnt (97%) rename board/common/rootfs/{ => usr}/libexec/infix/prod/fdisk (100%) rename board/common/rootfs/{ => usr}/libexec/infix/prod/provision (98%) diff --git a/board/aarch64/cn9130-crb/README.md b/board/aarch64/cn9130-crb/README.md index 3c100a85d..6dc658775 100644 --- a/board/aarch64/cn9130-crb/README.md +++ b/board/aarch64/cn9130-crb/README.md @@ -118,8 +118,8 @@ the device is reasonably correct, and run the provisioning script: admin@infix:~$ sudo -i root@infix:~$ udhcpc -i e28 - root@infix:~$ date -us YYYY-MM-DD - root@infix:~$ /libexec/infix/prod/provision tftp:///infix-aarch64.pkg /dev/mmcblk0 + root@infix:~$ date -us YYYY-MM-DD + root@infix:~$ /usr/libexec/infix/prod/provision tftp:///infix-aarch64.pkg /dev/mmcblk0 After successful completion, the device is fully provisioned. On the next boot, the device will boot of its own accord from the primary diff --git a/board/common/rootfs/etc/finit.d/10-infix.conf b/board/common/rootfs/etc/finit.d/10-infix.conf index dd0dc3939..d2aa8fce5 100644 --- a/board/common/rootfs/etc/finit.d/10-infix.conf +++ b/board/common/rootfs/etc/finit.d/10-infix.conf @@ -1,3 +1,3 @@ task name:ixinit log:tag:ixinit [S] \ - /usr/libexec/finit/runparts -bp /libexec/infix/init.d \ + /usr/libexec/finit/runparts -bp /usr/libexec/infix/init.d \ -- Probing system diff --git a/board/common/rootfs/etc/finit.d/available/mkcert.conf b/board/common/rootfs/etc/finit.d/available/mkcert.conf index 2fc7d35b1..125e831e0 100644 --- a/board/common/rootfs/etc/finit.d/available/mkcert.conf +++ b/board/common/rootfs/etc/finit.d/available/mkcert.conf @@ -1 +1 @@ -task [S] /libexec/infix/mkcert -- Verifying self-signed https certificate +task [S] /usr/libexec/infix/mkcert -- Verifying self-signed https certificate diff --git a/board/common/rootfs/etc/fstab b/board/common/rootfs/etc/fstab index 502c1865b..6c56c7f73 100644 --- a/board/common/rootfs/etc/fstab +++ b/board/common/rootfs/etc/fstab @@ -13,11 +13,11 @@ debugfs /sys/kernel/debug debugfs nofail 0 0 cfgfs /config configfs nofail,noauto 0 0 # The chosen backing storage for the overlays placed on /cfg, /etc, -# /home, /root, and /var, are determined dynamically by /libexec/infix/mnt +# /home, /root, and /var, are determined dynamically by /usr/libexec/infix/mnt # depending on the available devices. mnttmp /mnt/tmp tmpfs defaults 0 0 LABEL=aux /mnt/aux auto noatime,nodiratime,noauto 0 0 LABEL=var /mnt/var auto noatime,nodiratime,noauto 0 0 LABEL=cfg /mnt/cfg auto noatime,nodiratime,noauto 0 0 hostfs /mnt/host 9p cache=none,msize=16384,noauto 0 0 -/libexec/infix/mnt# /cfg helper none 0 0 +/usr/libexec/infix/mnt# /cfg helper none 0 0 diff --git a/board/common/rootfs/etc/udev/rules.d/90-media-mount.rules b/board/common/rootfs/etc/udev/rules.d/90-media-mount.rules index b387daf76..3ec9b0ea3 100644 --- a/board/common/rootfs/etc/udev/rules.d/90-media-mount.rules +++ b/board/common/rootfs/etc/udev/rules.d/90-media-mount.rules @@ -1,5 +1,5 @@ -KERNEL=="sd[a-z]", SUBSYSTEMS=="usb", ACTION=="add|change", RUN+="/libexec/infix/media add %k" -KERNEL=="sd[a-z]", SUBSYSTEMS=="usb", ACTION=="remove", RUN+="/libexec/infix/media del %k" +KERNEL=="sd[a-z]", SUBSYSTEMS=="usb", ACTION=="add|change", RUN+="/usr/libexec/infix/media add %k" +KERNEL=="sd[a-z]", SUBSYSTEMS=="usb", ACTION=="remove", RUN+="/usr/libexec/infix/media del %k" -KERNEL=="sd[a-z][0-9]", SUBSYSTEMS=="usb", ACTION=="add|change", RUN+="/libexec/infix/media add %k" -KERNEL=="sd[a-z][0-9]", SUBSYSTEMS=="usb", ACTION=="remove", RUN+="/libexec/infix/media del %k" +KERNEL=="sd[a-z][0-9]", SUBSYSTEMS=="usb", ACTION=="add|change", RUN+="/usr/libexec/infix/media add %k" +KERNEL=="sd[a-z][0-9]", SUBSYSTEMS=="usb", ACTION=="remove", RUN+="/usr/libexec/infix/media del %k" diff --git a/board/common/rootfs/libexec/infix/init.d/00-probe b/board/common/rootfs/usr/libexec/infix/init.d/00-probe similarity index 100% rename from board/common/rootfs/libexec/infix/init.d/00-probe rename to board/common/rootfs/usr/libexec/infix/init.d/00-probe diff --git a/board/common/rootfs/libexec/infix/init.d/05-product b/board/common/rootfs/usr/libexec/infix/init.d/05-product similarity index 100% rename from board/common/rootfs/libexec/infix/init.d/05-product rename to board/common/rootfs/usr/libexec/infix/init.d/05-product diff --git a/board/common/rootfs/libexec/infix/init.d/10-sysctl-sync-ip-conf b/board/common/rootfs/usr/libexec/infix/init.d/10-sysctl-sync-ip-conf similarity index 100% rename from board/common/rootfs/libexec/infix/init.d/10-sysctl-sync-ip-conf rename to board/common/rootfs/usr/libexec/infix/init.d/10-sysctl-sync-ip-conf diff --git a/board/common/rootfs/libexec/infix/init.d/20-nameif b/board/common/rootfs/usr/libexec/infix/init.d/20-nameif similarity index 100% rename from board/common/rootfs/libexec/infix/init.d/20-nameif rename to board/common/rootfs/usr/libexec/infix/init.d/20-nameif diff --git a/board/common/rootfs/libexec/infix/init.d/25-mqprio b/board/common/rootfs/usr/libexec/infix/init.d/25-mqprio similarity index 100% rename from board/common/rootfs/libexec/infix/init.d/25-mqprio rename to board/common/rootfs/usr/libexec/infix/init.d/25-mqprio diff --git a/board/common/rootfs/libexec/infix/init.d/30-cfg-migrate b/board/common/rootfs/usr/libexec/infix/init.d/30-cfg-migrate similarity index 100% rename from board/common/rootfs/libexec/infix/init.d/30-cfg-migrate rename to board/common/rootfs/usr/libexec/infix/init.d/30-cfg-migrate diff --git a/board/common/rootfs/libexec/infix/init.d/99-done b/board/common/rootfs/usr/libexec/infix/init.d/99-done similarity index 100% rename from board/common/rootfs/libexec/infix/init.d/99-done rename to board/common/rootfs/usr/libexec/infix/init.d/99-done diff --git a/board/common/rootfs/libexec/infix/media b/board/common/rootfs/usr/libexec/infix/media similarity index 100% rename from board/common/rootfs/libexec/infix/media rename to board/common/rootfs/usr/libexec/infix/media diff --git a/board/common/rootfs/libexec/infix/mkcert b/board/common/rootfs/usr/libexec/infix/mkcert similarity index 100% rename from board/common/rootfs/libexec/infix/mkcert rename to board/common/rootfs/usr/libexec/infix/mkcert diff --git a/board/common/rootfs/libexec/infix/mkkeys b/board/common/rootfs/usr/libexec/infix/mkkeys similarity index 100% rename from board/common/rootfs/libexec/infix/mkkeys rename to board/common/rootfs/usr/libexec/infix/mkkeys diff --git a/board/common/rootfs/libexec/infix/mnt b/board/common/rootfs/usr/libexec/infix/mnt similarity index 97% rename from board/common/rootfs/libexec/infix/mnt rename to board/common/rootfs/usr/libexec/infix/mnt index 7b5574019..56d6b7aad 100755 --- a/board/common/rootfs/libexec/infix/mnt +++ b/board/common/rootfs/usr/libexec/infix/mnt @@ -33,11 +33,11 @@ check_factory() fi # Add to your br2-external to extend factory-reset check - if [ ! -x /libexec/infix/check-factory ]; then + if [ ! -x /usr/libexec/infix/check-factory ]; then return 1; fi - /libexec/infix/check-factory + /usr/libexec/infix/check-factory } factory_reset() diff --git a/board/common/rootfs/libexec/infix/prod/fdisk b/board/common/rootfs/usr/libexec/infix/prod/fdisk similarity index 100% rename from board/common/rootfs/libexec/infix/prod/fdisk rename to board/common/rootfs/usr/libexec/infix/prod/fdisk diff --git a/board/common/rootfs/libexec/infix/prod/provision b/board/common/rootfs/usr/libexec/infix/prod/provision similarity index 98% rename from board/common/rootfs/libexec/infix/prod/provision rename to board/common/rootfs/usr/libexec/infix/prod/provision index b5cbd9937..c3de43069 100755 --- a/board/common/rootfs/libexec/infix/prod/provision +++ b/board/common/rootfs/usr/libexec/infix/prod/provision @@ -63,7 +63,7 @@ ok step "Formatting $blk" [ -b $blk ] || { echo "$blk is not a block device" >&2; err; } -/libexec/infix/prod/fdisk $blk || err +/usr/libexec/infix/prod/fdisk $blk || err sleep 1 ok diff --git a/src/confd/src/ietf-keystore.c b/src/confd/src/ietf-keystore.c index a1937fcb0..55a908e65 100644 --- a/src/confd/src/ietf-keystore.c +++ b/src/confd/src/ietf-keystore.c @@ -86,7 +86,7 @@ static int change_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *mod if (!fileok(priv_keyfile) || !fileok(pub_keyfile)) { NOTE("Generating NETCONF SSH host keys ..."); - if (systemf("/libexec/infix/mkkeys %s %s", priv_keyfile, pub_keyfile)) + if (systemf("/usr/libexec/infix/mkkeys %s %s", priv_keyfile, pub_keyfile)) goto err; } else { NOTE("Using existing SSH host keys for NETCONF.");