Fix templates for networkmanager and conf.d/net

install/1merge/networkmanager/system-connections/Auto_eth0

@@ -5,7 +5,7 @@ duplex=full
 mac-address=#-list(os_install_net_mac,0)-#
 
 [connection]
-id=Auto_#-list(os_install_net_interfaces,0)-# 
+id=Auto_#-list(os_install_net_interfaces,0)-#
 uuid=#-rnd(uuid,8)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,12)-#
 type=802-3-ethernet
 
@@ -13,6 +13,12 @@ type=802-3-ethernet
 method=ignore
 
 [ipv4]
+#?os_install_net_dns!=#
+dns=#-replace(' ',';',os_install_net_dns)-#;
+#os_install_net_dns#
+#?os_install_net_dns_search!=#
+dns-search=#-replace(' ',';',os_install_net_dns_search)-#;
+#os_install_net_dns_search#
 #?list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=#
 method=manual
 addresses1=#-list(os_install_net_ip,0)-#;#-list(os_install_net_cidr,0)-#;#-list(os_install_net_nmroute,0)-#

install/1merge/networkmanager/system-connections/Auto_eth1

@@ -5,7 +5,7 @@ duplex=full
 mac-address=#-list(os_install_net_mac,1)-#
 
 [connection]
-id=Auto_#-list(os_install_net_interfaces,1)-# 
+id=Auto_#-list(os_install_net_interfaces,1)-#
 uuid=#-rnd(uuid,8)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,12)-#
 type=802-3-ethernet
 
@@ -13,6 +13,12 @@ type=802-3-ethernet
 method=ignore
 
 [ipv4]
+#?os_install_net_dns!=#
+dns=#-replace(' ',';',os_install_net_dns)-#;
+#os_install_net_dns#
+#?os_install_net_dns_search!=#
+dns-search=#-replace(' ',';',os_install_net_dns_search)-#;
+#os_install_net_dns_search#
 #?list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=#
 method=manual
 addresses1=#-list(os_install_net_ip,1)-#;#-list(os_install_net_cidr,1)-#;#-list(os_install_net_nmroute,1)-#

install/1merge/networkmanager/system-connections/Auto_eth2

@@ -5,7 +5,7 @@ duplex=full
 mac-address=#-list(os_install_net_mac,2)-#
 
 [connection]
-id=Auto_#-list(os_install_net_interfaces,2)-# 
+id=Auto_#-list(os_install_net_interfaces,2)-#
 uuid=#-rnd(uuid,8)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,12)-#
 type=802-3-ethernet
 
@@ -13,6 +13,12 @@ type=802-3-ethernet
 method=ignore
 
 [ipv4]
+#?os_install_net_dns!=#
+dns=#-replace(' ',';',os_install_net_dns)-#;
+#os_install_net_dns#
+#?os_install_net_dns_search!=#
+dns-search=#-replace(' ',';',os_install_net_dns_search)-#;
+#os_install_net_dns_search#
 #?list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=#
 method=manual
 addresses1=#-list(os_install_net_ip,2)-#;#-list(os_install_net_cidr,2)-#;#-list(os_install_net_nmroute,2)-#

install/1merge/networkmanager/system-connections/Auto_eth3

@@ -5,7 +5,7 @@ duplex=full
 mac-address=#-list(os_install_net_mac,3)-#
 
 [connection]
-id=Auto_#-list(os_install_net_interfaces,3)-# 
+id=Auto_#-list(os_install_net_interfaces,3)-#
 uuid=#-rnd(uuid,8)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,12)-#
 type=802-3-ethernet
 
@@ -13,6 +13,12 @@ type=802-3-ethernet
 method=ignore
 
 [ipv4]
+#?os_install_net_dns!=#
+dns=#-replace(' ',';',os_install_net_dns)-#;
+#os_install_net_dns#
+#?os_install_net_dns_search!=#
+dns-search=#-replace(' ',';',os_install_net_dns_search)-#;
+#os_install_net_dns_search#
 #?list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=#
 method=manual
 addresses1=#-list(os_install_net_ip,3)-#;#-list(os_install_net_cidr,3)-#;#-list(os_install_net_nmroute,3)-#

install/1merge/openrc/conf.d/net

@@ -1,5 +1,8 @@
-# Calculate comment=# exists(/etc/conf.d/net,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up
+# 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
 
+#?os_install_linux_system==server#
+modules="!plug"
+#os_install_linux_system#
 #?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=#
 config_#-list(os_install_net_interfaces,0)-#=( "#-list(os_install_net_ip,0)-#/#-list(os_install_net_cidr,0)-#" )
 routes_#-list(os_install_net_interfaces,0)-#="#-list(os_install_net_route,0)-#"