From cd3ff4e5e51d6b4c5213a0a99ca1f98fef4defe8 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Wed, 8 May 2024 11:31:31 +0200 Subject: [PATCH] module-mig: Correct nm config restore location --- usr/lib/tik/lib/tik-functions | 2 -- usr/lib/tik/modules/post/20-mig | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/usr/lib/tik/lib/tik-functions b/usr/lib/tik/lib/tik-functions index 632b7b0..5bc2c2b 100644 --- a/usr/lib/tik/lib/tik-functions +++ b/usr/lib/tik/lib/tik-functions @@ -247,8 +247,6 @@ set_boot_target() { prun /usr/sbin/efibootmgr -B -L "openSUSE Boot Manager" prun /usr/sbin/efibootmgr -B -L "opensuse-secureboot" prun /usr/sbin/efibootmgr -B -L "opensuse" - # Clear boot order, to make absolutely sure this new installation is first - prun /usr/sbin/efibootmgr -O # Currently assuming Aeon-like partition layout and shim name. This function will need extra intelligence to probe partitions for other image layouts prun /usr/sbin/efibootmgr -c -L "openSUSE Boot Manager" -d ${TIK_INSTALL_DEVICE} -l "\EFI\systemd\shim.efi" -p 2 # Log to show the resulting eficonfig diff --git a/usr/lib/tik/modules/post/20-mig b/usr/lib/tik/modules/post/20-mig index c8e5b40..5c4818a 100644 --- a/usr/lib/tik/modules/post/20-mig +++ b/usr/lib/tik/modules/post/20-mig @@ -19,7 +19,7 @@ if [ "${migrate}" == 1 ]; then prun /usr/bin/cat ${mig_dir}/passwd.out | prun tee -a ${mig_dir}/mnt/etc/passwd prun /usr/bin/cat ${mig_dir}/shadow.out | prun tee -a ${mig_dir}/mnt/etc/shadow prun /usr/bin/sed -i "/^wheel:/ s/$/$(head -n 1 ${mig_dir}/passwd.out | awk -F'[/:]' '{print $1}')/" ${mig_dir}/mnt/etc/group - prun /usr/bin/cp -a ${mig_dir}/system-connections ${mig_dir}/mnt/etc/NetworkManager/system-connections + prun /usr/bin/cp -a ${mig_dir}/system-connections/* ${mig_dir}/mnt/etc/NetworkManager/system-connections prun /usr/bin/umount ${mig_dir}/mnt/etc prun /usr/bin/umount ${mig_dir}/mnt/var prun /usr/bin/umount ${mig_dir}/mnt