[PATCH 2/7 rhel6-branch] vlan support: enable vlan in NM in installer (sysconfig/network)
Radek Vykydal
rvykydal at redhat.com
Mon Aug 27 08:46:34 UTC 2012
This may be temporary, I am discussing NM default with NM
---
loader/loader.c | 5 +++++
loader/net.c | 18 ++++++++++++++++++
loader/net.h | 1 +
3 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/loader/loader.c b/loader/loader.c
index 15826fe..926cecc 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -2254,6 +2254,11 @@ int main(int argc, char ** argv) {
}
#endif
+ /* Enable vlan and bonding support in NetworkManager */
+ if ((i = enable_NM_BOND_VLAN()) != 0) {
+ logMessage(INFO, "failed to enable VLAN for NetworkManager");
+ }
+
/* Start NetworkManager now so it's always available to talk to. */
if (iface_start_NetworkManager(loaderData.dhcpTimeout))
logMessage(INFO, "failed to start NetworkManager");
diff --git a/loader/net.c b/loader/net.c
index 773c5c1..17c91ac 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -1580,6 +1580,24 @@ int writeEnabledNetInfo(iface_t *iface) {
return 0;
}
+int enable_NM_BOND_VLAN() {
+ FILE *fp = NULL;
+
+ if ((fp = fopen(SYSCONFIG_PATH"/.network", "w")) == NULL) {
+ return 1;
+ }
+
+ fprintf(fp, "NM_BOND_VLAN_ENABLED=yes\n");
+ fclose(fp);
+ if (rename(SYSCONFIG_PATH"/.network",
+ SYSCONFIG_PATH"/network") == -1) {
+ return 2;
+ }
+
+ return 0;
+
+}
+
void setKickstartNetwork(struct loaderData_s * loaderData, int argc,
char ** argv) {
iface_t iface;
diff --git a/loader/net.h b/loader/net.h
index a35dd5b..99ae23e 100644
--- a/loader/net.h
+++ b/loader/net.h
@@ -86,5 +86,6 @@ int wait_for_iface_activation(char * ifname, int timeout);
int wait_for_iface_disconnection(char *ifname);
int isURLRemote(char *url);
int split_ipv6addr_prefix_length(char *str, char **address, char **prefix);
+int enable_NM_BOND_VLAN(void);
#endif
--
1.7.4
More information about the anaconda-patches
mailing list