diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-09-20 09:36:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-20 09:36:00 +0200 |
| commit | fb9049107749dd02ef153555cb4a8857b9832f0d (patch) | |
| tree | 424c7eba422079be975a7ce748ae92b25f9e4218 | |
| parent | 1a676a2531904fdef4f2de6ad6c6eabe38421dfb (diff) | |
| parent | 2971a8b4698e6f4ded2a1440f2c8ccd2d22bb078 (diff) | |
| download | live-boot-fb9049107749dd02ef153555cb4a8857b9832f0d.tar.gz live-boot-fb9049107749dd02ef153555cb4a8857b9832f0d.zip | |
Merge pull request #8 from jestabro/simplified-bind-mount
T7836: move bind mount of /config to vyos-1x
| -rwxr-xr-x | components/9990-main.sh | 2 | ||||
| -rwxr-xr-x | components/9990-vyos.sh | 32 |
2 files changed, 0 insertions, 34 deletions
diff --git a/components/9990-main.sh b/components/9990-main.sh index 2468112..30dc0c2 100755 --- a/components/9990-main.sh +++ b/components/9990-main.sh @@ -194,8 +194,6 @@ Live () Swap - Vyos - exec 1>&6 6>&- exec 2>&7 7>&- kill ${tailpid} diff --git a/components/9990-vyos.sh b/components/9990-vyos.sh deleted file mode 100755 index 77d974f..0000000 --- a/components/9990-vyos.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -#set -e - -Vyos () -{ - # live-initramfs header - . /scripts/functions - . /lib/live/boot/9990-initramfs-tools.sh - - log_begin_msg "Configuring VyOS config path" - - # bind the vyatta config directory with the following precedence - # 1) backing store if present - # 2) create live/"overlay" which may or maynot be on a non-volatile device - # but is certainly read-write - - VYOS_MOUNT_DIR="$(echo ${VYOS_MOUNT} | sed 's/live/mount/')" - unioncfgpath="$(trim_path /root/lib/live/${VYOS_MOUNT_DIR}/${PERSISTENCE_PATH}/rw)" - - if [ -d /root/opt/vyatta/etc/config ] - then - if [ -d ${unioncfgpath}/config ] - then - mount -o bind ${unioncfgpath}/config /root/opt/vyatta/etc/config - else - cp -a /root/opt/vyatta/etc/config ${unioncfgpath} >/dev/null 2>&1 - mount -o bind ${unioncfgpath}/config /root/opt/vyatta/etc/config - fi - fi - log_end_msg -} |