module-mig: Correct nm config restore location

sysrich · May 8, 2024 · cd3ff4e · cd3ff4e
1 parent 9cdfc66
commit cd3ff4e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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