Skip to content

Commit

Permalink
Follow-up to 2194f7b: migrate /libexec to /usr/libexec
Browse files Browse the repository at this point in the history
For consistency with the / + /usr merge, see 2194f7b, let's move the
last remnants in /: /libexec/infix to /usr/libexec/infix

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
  • Loading branch information
troglobit committed Aug 8, 2024
1 parent 2201543 commit fa1cece
Show file tree
Hide file tree
Showing 19 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions board/aarch64/cn9130-crb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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://<PC-IP>/infix-aarch64.pkg /dev/mmcblk0
root@infix:~$ date -us YYYY-MM-DD
root@infix:~$ /usr/libexec/infix/prod/provision tftp://<PC-IP>/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
Expand Down
2 changes: 1 addition & 1 deletion board/common/rootfs/etc/finit.d/10-infix.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
task name:ixinit log:tag:ixinit [S] <pid/syslogd> \
/usr/libexec/finit/runparts -bp /libexec/infix/init.d \
/usr/libexec/finit/runparts -bp /usr/libexec/infix/init.d \
-- Probing system
2 changes: 1 addition & 1 deletion board/common/rootfs/etc/finit.d/available/mkcert.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
task [S] <service/confd/ready> /libexec/infix/mkcert -- Verifying self-signed https certificate
task [S] <service/confd/ready> /usr/libexec/infix/mkcert -- Verifying self-signed https certificate
4 changes: 2 additions & 2 deletions board/common/rootfs/etc/fstab
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions board/common/rootfs/etc/udev/rules.d/90-media-mount.rules
Original file line number Diff line number Diff line change
@@ -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"
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/confd/src/ietf-keystore.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
Expand Down

0 comments on commit fa1cece

Please sign in to comment.