From 25b7997ccb431390bda0e44aae2fcac5f7bbb7ad Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Wed, 22 Jun 2011 12:45:32 +0400 Subject: [PATCH] Fix templates for networkmanager and conf.d/net --- .../1merge/networkmanager/system-connections/Auto_eth0 | 8 +++++++- .../1merge/networkmanager/system-connections/Auto_eth1 | 8 +++++++- .../1merge/networkmanager/system-connections/Auto_eth2 | 8 +++++++- .../1merge/networkmanager/system-connections/Auto_eth3 | 8 +++++++- install/1merge/openrc/conf.d/net | 5 ++++- 5 files changed, 32 insertions(+), 5 deletions(-) diff --git a/install/1merge/networkmanager/system-connections/Auto_eth0 b/install/1merge/networkmanager/system-connections/Auto_eth0 index 02dec97..b5b26e3 100644 --- a/install/1merge/networkmanager/system-connections/Auto_eth0 +++ b/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)-# diff --git a/install/1merge/networkmanager/system-connections/Auto_eth1 b/install/1merge/networkmanager/system-connections/Auto_eth1 index 8577ac2..688f9ca 100644 --- a/install/1merge/networkmanager/system-connections/Auto_eth1 +++ b/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)-# diff --git a/install/1merge/networkmanager/system-connections/Auto_eth2 b/install/1merge/networkmanager/system-connections/Auto_eth2 index bde1604..1a2319e 100644 --- a/install/1merge/networkmanager/system-connections/Auto_eth2 +++ b/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)-# diff --git a/install/1merge/networkmanager/system-connections/Auto_eth3 b/install/1merge/networkmanager/system-connections/Auto_eth3 index 75c28d6..a9db9e5 100644 --- a/install/1merge/networkmanager/system-connections/Auto_eth3 +++ b/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)-# diff --git a/install/1merge/openrc/conf.d/net b/install/1merge/openrc/conf.d/net index 7f28609..a40ea98 100644 --- a/install/1merge/openrc/conf.d/net +++ b/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)-#"