summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2026-07-06 15:34:04 +0300
committerGitHub <noreply@github.com>2026-07-06 15:34:04 +0300
commit6f2b5a12e29deb46c9a724f8405d9b4f67e6420f (patch)
tree004ffb9e8b719bb5b33529df6bea55ae078e3ee8
parentb90c21db2edefb02e22ea9233cf76ed6435f91f6 (diff)
parent2a73f2a1bdd1c1ea6b7fd3d27ba8c2e335fa14bb (diff)
downloadvyos-1x-6f2b5a12e29deb46c9a724f8405d9b4f67e6420f.tar.gz
vyos-1x-6f2b5a12e29deb46c9a724f8405d9b4f67e6420f.zip
Merge pull request #5308 from natali-rs1985/T8344
T8344: Preserve symlinks when copying config to/from TPM encrypted volume
-rwxr-xr-xsrc/helpers/vyos-config-encrypt.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/helpers/vyos-config-encrypt.py b/src/helpers/vyos-config-encrypt.py
index e035040e1..876a835ec 100755
--- a/src/helpers/vyos-config-encrypt.py
+++ b/src/helpers/vyos-config-encrypt.py
@@ -122,7 +122,9 @@ def encrypt_config(key, recovery_key=None, is_tpm=True):
cmd(f'mount /dev/mapper/vyos_config {d}')
# Move mount_path to encrypted volume
- shutil.copytree(mount_path, d, copy_function=shutil.move, dirs_exist_ok=True)
+ shutil.copytree(
+ mount_path, d, symlinks=True, copy_function=shutil.move, dirs_exist_ok=True
+ )
cmd(f'chgrp -R vyattacfg {d}')
cmd(f'umount {d}')
@@ -207,7 +209,9 @@ def decrypt_config(key):
cmd(f'mount /dev/mapper/vyos_config {d}')
# Move encrypted volume to /opt/vyatta/etc/config
- shutil.copytree(d, mount_path, copy_function=shutil.move, dirs_exist_ok=True)
+ shutil.copytree(
+ d, mount_path, symlinks=True, copy_function=shutil.move, dirs_exist_ok=True
+ )
cmd(f'chgrp -R vyattacfg {mount_path}')
cmd(f'umount {d}')