diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-09-20 09:36:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-20 09:36:06 +0200 |
| commit | 91afb698a063499f81bc967e57f07e6ea5823eb0 (patch) | |
| tree | 3616f109a8e8f181a1274d812d64612fb9de9135 /src/init | |
| parent | 60a322e975cec08a92c3980cc8a703ee8bff8841 (diff) | |
| parent | 2d32d325df9c13609f73f1c6da36cd3656b657ed (diff) | |
| download | vyos-1x-91afb698a063499f81bc967e57f07e6ea5823eb0.tar.gz vyos-1x-91afb698a063499f81bc967e57f07e6ea5823eb0.zip | |
Merge pull request #4732 from jestabro/simplified-bind-mount
T7836: move bind mount of /config to vyos-1x
Diffstat (limited to 'src/init')
| -rwxr-xr-x | src/init/vyos-router | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/init/vyos-router b/src/init/vyos-router index 7a02ce564..34c216cd6 100755 --- a/src/init/vyos-router +++ b/src/init/vyos-router @@ -120,7 +120,6 @@ mount_encrypted_config() { return 1 fi - mount /dev/mapper/vyos_config /config mount /dev/mapper/vyos_config $vyatta_sysconfdir/config echo "Mounted encrypted config volume" @@ -143,7 +142,6 @@ unmount_encrypted_config() { return fi - umount /config umount $vyatta_sysconfdir/config cryptsetup close vyos_config @@ -314,6 +312,17 @@ bind_mount_boot () fi } +bind_mount_slash_config () +{ + if [ -d /opt/vyatta/etc/config ] + then + if [ ! -d /config ] ; then + mkdir /config + fi + mount --bind /opt/vyatta/etc/config /config + fi +} + clear_or_override_config_files () { for conf in snmp/snmpd.conf snmp/snmptrapd.conf snmp/snmp.conf \ @@ -587,6 +596,8 @@ start () bind_mount_boot + disabled bind_mount_slash_config || bind_mount_slash_config + disabled configure || load_bootfile || overall_status=1 log_end_msg $? |