diff --git a/arkdep b/arkdep index 7f55879..ce6fe13 100755 --- a/arkdep +++ b/arkdep @@ -55,7 +55,7 @@ if [[ ! $1 == 'init' ]]; then [[ -z ${update_cpu_microcode+x} ]] && update_cpu_microcode=1 && printf '\e[1;33m\e[0m\e[1m update_cpu_microcode not defined in config, using default\e[0m\n' [[ -z ${backup_user_accounts+x} ]] && backup_user_accounts=1 && printf '\e[1;33m\e[0m\e[1m backup_user_accounts not defined in config, using default\e[0m\n' [[ -z ${latest_image_always_default+x} ]] && latest_image_always_default=0 && printf '\e[1;33m\e[0m\e[1m latest_image_always_default not defined in config, using default\e[0m\n' - [[ -z ${migrate_files+x} ]] && migrate_files=('var/usrlocal' 'var/usrliblocale' 'var/opt' 'var/srv' 'var/nm-system-connections' 'var/lib/AccountsService' 'var/lib/bluetooth' 'var/lib/NetworkManager' 'var/lib/arkane' 'etc/localtime' 'etc/locale.gen' 'etc/locale.conf') && printf '\e[1;33m\e[0m\e[1m migrate_files not defined in config, using default\e[0m\n' + [[ -z ${migrate_files+x} ]] && migrate_files=('var/usrlocal' 'var/usrliblocale' 'var/opt' 'var/srv' 'var/lib/AccountsService' 'var/lib/bluetooth' 'var/lib/NetworkManager' 'var/lib/arkane' 'etc/localtime' 'etc/locale.gen' 'etc/locale.conf' 'etc/NetworkManager/system-connections') && printf '\e[1;33m\e[0m\e[1m migrate_files not defined in config, using default\e[0m\n' [[ -z ${load_extensions+x} ]] && load_extensions=0 && printf '\e[1;33m\e[0m\e[1m load_extensions not defined in config, using default\e[0m\n' [[ -z ${remove_tar_after_deployment+x} ]] && remove_tar_after_deployment=1 && printf '\e[1;33m\e[0m\e[1m remove_tar_after_deployment not defined in config, using default\e[0m\n' [[ -z ${update_diff_style+x} ]] && update_diff_style='list' && printf '\e[1;33m\e[0m\e[1m update_diff_style not defined in config, using default\e[0m\n' diff --git a/arkdep-build b/arkdep-build index f3c0b8d..5032b27 100755 --- a/arkdep-build +++ b/arkdep-build @@ -294,12 +294,6 @@ if [[ $type == 'archlinux' ]]; then mv $workdir/mnt $workdir/var/mnt || cleanup_and_quit 'Failed to move mnt to var/mnt' ln -sv var/mnt $workdir/mnt || cleanup_and_quit 'Failed to create mnt symlink' - # NetworkManager system-connections symlink if installed - if [[ -d $workdir/etc/NetworkManager ]]; then - mv $workdir/etc/NetworkManager/system-connections $workdir/var/nm-system-connections || cleanup_and_quit 'Failed to move etc/NetworkManager/system-connections to var/nm-system-connections' - ln -sv ../../var/nm-system-connections $workdir/etc/NetworkManager/system-connections || cleanup_and_quit 'Failed to create nm-system-connections symlink' - fi - printf '\e[1;34m-->\e[0m\e[1m Creating mountpoints for shared subvolumes\e[0m\n' # Remove the folders to ensure they are empty