From 433d810c7f243d6d0f082316f760824ea425847b Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 21 Jun 2011 18:12:52 +0400 Subject: [PATCH] Fix var name. --- install/1merge/networkmanager/default/NetworkManager | 2 +- install/1merge/networkmanager/default/NetworkManager.remove | 2 +- install/1merge/networkmanager/system-connections/Auto_eth0 | 2 +- install/1merge/networkmanager/system-connections/Auto_eth1 | 2 +- install/1merge/networkmanager/system-connections/Auto_eth2 | 2 +- install/1merge/networkmanager/system-connections/Auto_eth3 | 2 +- install/1merge/openrc/init.d/net.eth0 | 2 +- install/1merge/openrc/init.d/net.eth0.del | 2 +- install/1merge/openrc/init.d/net.eth1 | 2 +- install/1merge/openrc/init.d/net.eth1.del | 2 +- install/1merge/openrc/init.d/net.eth2 | 2 +- install/1merge/openrc/init.d/net.eth2.del | 2 +- install/1merge/openrc/init.d/net.eth3 | 2 +- install/1merge/openrc/init.d/net.eth3.del | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/install/1merge/networkmanager/default/NetworkManager b/install/1merge/networkmanager/default/NetworkManager index 108046e..c95c528 100644 --- a/install/1merge/networkmanager/default/NetworkManager +++ b/install/1merge/networkmanager/default/NetworkManager @@ -1 +1 @@ -# Calculate link=/etc/init.d/NetworkManager symbolic os_install_net_setup==networkmanager +# Calculate link=/etc/init.d/NetworkManager symbolic os_install_net_conf==networkmanager diff --git a/install/1merge/networkmanager/default/NetworkManager.remove b/install/1merge/networkmanager/default/NetworkManager.remove index 934e4bf..99bf0b2 100644 --- a/install/1merge/networkmanager/default/NetworkManager.remove +++ b/install/1merge/networkmanager/default/NetworkManager.remove @@ -1 +1 @@ -# Calculate name=NetworkManager append=remove os_install_net_setup!=networkmanager&&exists(/etc/runlevels/default/NetworkManager)!= +# Calculate name=NetworkManager append=remove os_install_net_conf!=networkmanager&&exists(/etc/runlevels/default/NetworkManager)!= diff --git a/install/1merge/networkmanager/system-connections/Auto_eth0 b/install/1merge/networkmanager/system-connections/Auto_eth0 index 39ff89e..02dec97 100644 --- a/install/1merge/networkmanager/system-connections/Auto_eth0 +++ b/install/1merge/networkmanager/system-connections/Auto_eth0 @@ -1,4 +1,4 @@ -# Calculate name=Auto_#-list(os_install_net_interfaces,0)-# cl_chroot_status==off&&list(os_install_net_interfaces,0)!=&&os_install_net_setup==networkmanager chmod=0600 +# Calculate name=Auto_#-list(os_install_net_interfaces,0)-# cl_chroot_status==off&&list(os_install_net_interfaces,0)!=&&os_install_net_conf==networkmanager chmod=0600 [802-3-ethernet] duplex=full diff --git a/install/1merge/networkmanager/system-connections/Auto_eth1 b/install/1merge/networkmanager/system-connections/Auto_eth1 index 207462f..8577ac2 100644 --- a/install/1merge/networkmanager/system-connections/Auto_eth1 +++ b/install/1merge/networkmanager/system-connections/Auto_eth1 @@ -1,4 +1,4 @@ -# Calculate name=Auto_#-list(os_install_net_interfaces,1)-# cl_chroot_status==off&&list(os_install_net_interfaces,1)!=&&os_install_net_setup==networkmanager chmod=0600 +# Calculate name=Auto_#-list(os_install_net_interfaces,1)-# cl_chroot_status==off&&list(os_install_net_interfaces,1)!=&&os_install_net_conf==networkmanager chmod=0600 [802-3-ethernet] duplex=full diff --git a/install/1merge/networkmanager/system-connections/Auto_eth2 b/install/1merge/networkmanager/system-connections/Auto_eth2 index d124518..bde1604 100644 --- a/install/1merge/networkmanager/system-connections/Auto_eth2 +++ b/install/1merge/networkmanager/system-connections/Auto_eth2 @@ -1,4 +1,4 @@ -# Calculate name=Auto_#-list(os_install_net_interfaces,2)-# cl_chroot_status==off&&list(os_install_net_interfaces,2)!=&&os_install_net_setup==networkmanager chmod=0600 +# Calculate name=Auto_#-list(os_install_net_interfaces,2)-# cl_chroot_status==off&&list(os_install_net_interfaces,2)!=&&os_install_net_conf==networkmanager chmod=0600 [802-3-ethernet] duplex=full diff --git a/install/1merge/networkmanager/system-connections/Auto_eth3 b/install/1merge/networkmanager/system-connections/Auto_eth3 index 15820fe..75c28d6 100644 --- a/install/1merge/networkmanager/system-connections/Auto_eth3 +++ b/install/1merge/networkmanager/system-connections/Auto_eth3 @@ -1,4 +1,4 @@ -# Calculate name=Auto_#-list(os_install_net_interfaces,3)-# cl_chroot_status==off&&list(os_install_net_interfaces,3)!=&&os_install_net_setup==networkmanager chmod=0600 +# Calculate name=Auto_#-list(os_install_net_interfaces,3)-# cl_chroot_status==off&&list(os_install_net_interfaces,3)!=&&os_install_net_conf==networkmanager chmod=0600 [802-3-ethernet] duplex=full diff --git a/install/1merge/openrc/init.d/net.eth0 b/install/1merge/openrc/init.d/net.eth0 index 2954f98..7d0acea 100644 --- a/install/1merge/openrc/init.d/net.eth0 +++ b/install/1merge/openrc/init.d/net.eth0 @@ -1 +1 @@ -# Calculate name=net.#-list(os_install_net_interfaces,0)-# cl_chroot_status==off&&list(os_install_net_interfaces,0)!=&&os_install_net_setup==openrc link=net.lo symbolic +# Calculate name=net.#-list(os_install_net_interfaces,0)-# cl_chroot_status==off&&list(os_install_net_interfaces,0)!=&&os_install_net_conf==openrc link=net.lo symbolic diff --git a/install/1merge/openrc/init.d/net.eth0.del b/install/1merge/openrc/init.d/net.eth0.del index ac34178..aef023c 100644 --- a/install/1merge/openrc/init.d/net.eth0.del +++ b/install/1merge/openrc/init.d/net.eth0.del @@ -1 +1 @@ -# Calculate append=remove name=net.#-list(os_install_net_interfaces,0)-# cl_chroot_status==off&&list(os_install_net_interfaces,0)!=&&os_install_net_setup!=openrc +# Calculate append=remove name=net.#-list(os_install_net_interfaces,0)-# cl_chroot_status==off&&list(os_install_net_interfaces,0)!=&&os_install_net_conf!=openrc diff --git a/install/1merge/openrc/init.d/net.eth1 b/install/1merge/openrc/init.d/net.eth1 index 3afc137..91af9a3 100644 --- a/install/1merge/openrc/init.d/net.eth1 +++ b/install/1merge/openrc/init.d/net.eth1 @@ -1 +1 @@ -# Calculate name=net.#-list(os_install_net_interfaces,1)-# cl_chroot_status==off&&list(os_install_net_interfaces,1)!=&&os_install_net_setup==openrc link=net.lo symbolic +# Calculate name=net.#-list(os_install_net_interfaces,1)-# cl_chroot_status==off&&list(os_install_net_interfaces,1)!=&&os_install_net_conf==openrc link=net.lo symbolic diff --git a/install/1merge/openrc/init.d/net.eth1.del b/install/1merge/openrc/init.d/net.eth1.del index c9f9a47..62cca72 100644 --- a/install/1merge/openrc/init.d/net.eth1.del +++ b/install/1merge/openrc/init.d/net.eth1.del @@ -1 +1 @@ -# Calculate append=remove name=net.#-list(os_install_net_interfaces,1)-# cl_chroot_status==off&&list(os_install_net_interfaces,1)!=&&os_install_net_setup!=openrc +# Calculate append=remove name=net.#-list(os_install_net_interfaces,1)-# cl_chroot_status==off&&list(os_install_net_interfaces,1)!=&&os_install_net_conf!=openrc diff --git a/install/1merge/openrc/init.d/net.eth2 b/install/1merge/openrc/init.d/net.eth2 index 550c8c5..6e89d6c 100644 --- a/install/1merge/openrc/init.d/net.eth2 +++ b/install/1merge/openrc/init.d/net.eth2 @@ -1 +1 @@ -# Calculate name=net.#-list(os_install_net_interfaces,2)-# cl_chroot_status==off&&list(os_install_net_interfaces,2)!=&&os_install_net_setup==openrc link=net.lo symbolic +# Calculate name=net.#-list(os_install_net_interfaces,2)-# cl_chroot_status==off&&list(os_install_net_interfaces,2)!=&&os_install_net_conf==openrc link=net.lo symbolic diff --git a/install/1merge/openrc/init.d/net.eth2.del b/install/1merge/openrc/init.d/net.eth2.del index 9678b5a..a5a22e3 100644 --- a/install/1merge/openrc/init.d/net.eth2.del +++ b/install/1merge/openrc/init.d/net.eth2.del @@ -1 +1 @@ -# Calculate append=remove name=net.#-list(os_install_net_interfaces,2)-# cl_chroot_status==off&&list(os_install_net_interfaces,2)!=&&os_install_net_setup!=openrc +# Calculate append=remove name=net.#-list(os_install_net_interfaces,2)-# cl_chroot_status==off&&list(os_install_net_interfaces,2)!=&&os_install_net_conf!=openrc diff --git a/install/1merge/openrc/init.d/net.eth3 b/install/1merge/openrc/init.d/net.eth3 index 6fa981a..eb12e0e 100644 --- a/install/1merge/openrc/init.d/net.eth3 +++ b/install/1merge/openrc/init.d/net.eth3 @@ -1 +1 @@ -# Calculate name=net.#-list(os_install_net_interfaces,3)-# cl_chroot_status==off&&list(os_install_net_interfaces,3)!=&&os_install_net_setup==openrc link=net.lo symbolic +# Calculate name=net.#-list(os_install_net_interfaces,3)-# cl_chroot_status==off&&list(os_install_net_interfaces,3)!=&&os_install_net_conf==openrc link=net.lo symbolic diff --git a/install/1merge/openrc/init.d/net.eth3.del b/install/1merge/openrc/init.d/net.eth3.del index fa3d8b4..7278d35 100644 --- a/install/1merge/openrc/init.d/net.eth3.del +++ b/install/1merge/openrc/init.d/net.eth3.del @@ -1 +1 @@ -# Calculate append=remove name=net.#-list(os_install_net_interfaces,3)-# cl_chroot_status==off&&list(os_install_net_interfaces,3)!=&&os_install_net_setup!=openrc +# Calculate append=remove name=net.#-list(os_install_net_interfaces,3)-# cl_chroot_status==off&&list(os_install_net_interfaces,3)!=&&os_install_net_conf!=openrc