diff --git a/install/1merge/00-calculate-install/calculate2.env b/install/1merge/00-calculate-install/calculate2.env new file mode 100644 index 0000000..cead32f --- /dev/null +++ b/install/1merge/00-calculate-install/calculate2.env @@ -0,0 +1,4 @@ +# Calculate format=samba path=/etc/calculate + +[install] +os_install_net_settings = #-os_install_net_conf-# diff --git a/install/1merge/networkmanager/system-connections/.calculate_directory b/install/1merge/networkmanager/system-connections/.calculate_directory index 4401bf6..b3a2ea7 100644 --- a/install/1merge/networkmanager/system-connections/.calculate_directory +++ b/install/1merge/networkmanager/system-connections/.calculate_directory @@ -1 +1 @@ -# Calculate path=/etc/NetworkManager exists(/etc/NetworkManager/system-connections,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up +# Calculate path=/etc/NetworkManager os_install_net_settings!=networkmanager&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up diff --git a/install/1merge/openrc/conf.d/net b/install/1merge/openrc/conf.d/net index ab11f5b..4d39ad5 100644 --- a/install/1merge/openrc/conf.d/net +++ b/install/1merge/openrc/conf.d/net @@ -1,4 +1,4 @@ -# Calculate comment=# exists(/etc/conf.d/net,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd&&os_install_net_conf==openrc||ac_install_system==up&&os_install_net_conf==openrc +# Calculate comment=# os_install_net_settings!=openrc&&cl_chroot_status==off&&os_install_root_type!=livecd&&os_install_net_conf==openrc||ac_install_system==up&&os_install_net_conf==openrc #?os_install_linux_system==server# modules="!plug"