diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2008-07-17 08:55:33 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2008-07-17 08:55:33 -0400 |
| commit | 28b71c6ea030295c16d7d2153c52a31aee884e7d (patch) | |
| tree | fad12ccec14665b79e7320afd301afe00b91f20e | |
| parent | 5a5794cc4b527f28ada54aac9426fd7512bcb421 (diff) | |
| download | tools-28b71c6ea030295c16d7d2153c52a31aee884e7d.tar.gz tools-28b71c6ea030295c16d7d2153c52a31aee884e7d.tar.xz tools-28b71c6ea030295c16d7d2153c52a31aee884e7d.zip | |
NetworkManager was messing up the genome-bridge
| -rw-r--r-- | genome-bridge/genome-bridge | 4 | ||||
| -rw-r--r-- | genome-bridge/genome-bridge.spec | 2 | ||||
| -rw-r--r-- | genome-repo/genome-repo-1.0.0/Cloud.ks | 3 | ||||
| -rw-r--r-- | genome-repo/genome-repo.spec | 2 | ||||
| -rw-r--r-- | genome-respin/genome-respin.spec | 2 | ||||
| -rw-r--r-- | genome-respin/repo/conf.d/cloud-ks.cfg | 2 |
6 files changed, 11 insertions, 4 deletions
diff --git a/genome-bridge/genome-bridge b/genome-bridge/genome-bridge index 908b0c8..67f6315 100644 --- a/genome-bridge/genome-bridge +++ b/genome-bridge/genome-bridge @@ -17,15 +17,17 @@ BRIDGE="genomebr0" case "$1" in start) echo -n $"Starting genome-bridge: " + /usr/bin/pkill -f "dhclient eth0" + /usr/bin/pkill -f "dhclient $BRIDGE" /usr/sbin/brctl addbr $BRIDGE /sbin/ifconfig eth0 0.0.0.0 promisc up /usr/sbin/brctl addif $BRIDGE eth0 #TODO: support more than eth0 - /usr/bin/pkill -f "dhclient eth0" /sbin/dhclient $BRIDGE #TODO: support static IPs RETVAL=$? ;; stop) echo -n $"Stopping genome-bridge: " + /sbin/ifconfig $BRIDGE down /sbin/service network restart /usr/sbin/brctl delbr $BRIDGE RETVAL=$? diff --git a/genome-bridge/genome-bridge.spec b/genome-bridge/genome-bridge.spec index 5e726cc..a6a2eab 100644 --- a/genome-bridge/genome-bridge.spec +++ b/genome-bridge/genome-bridge.spec @@ -1,6 +1,6 @@ Name: genome-bridge Version: 1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Genome network bridge Group: System Environment/Base License: GPLv2 diff --git a/genome-repo/genome-repo-1.0.0/Cloud.ks b/genome-repo/genome-repo-1.0.0/Cloud.ks index 84fc862..bf05e31 100644 --- a/genome-repo/genome-repo-1.0.0/Cloud.ks +++ b/genome-repo/genome-repo-1.0.0/Cloud.ks @@ -85,6 +85,9 @@ if [ "$certmaster" == "localhost" ]; then /sbin/chkconfig httpd on fi +# Need for the bridge +/sbin/chkconfig NetworkManager off +/sbin/chkconfig network on /sbin/chkconfig genome-bridge on $yum_config_stanza diff --git a/genome-repo/genome-repo.spec b/genome-repo/genome-repo.spec index c4b39c7..ef39175 100644 --- a/genome-repo/genome-repo.spec +++ b/genome-repo/genome-repo.spec @@ -1,6 +1,6 @@ Name: genome-repo Version: 1.0.0 -Release: 41%{?dist} +Release: 42%{?dist} Summary: Genome repository Group: Applications/System diff --git a/genome-respin/genome-respin.spec b/genome-respin/genome-respin.spec index f154bcd..409558a 100644 --- a/genome-respin/genome-respin.spec +++ b/genome-respin/genome-respin.spec @@ -2,7 +2,7 @@ Summary: Genome Respins Name: genome-respin Source: genome-respin-bin.tar.gz Version: 1.0.0 -Release: 6%{?dist} +Release: 7%{?dist} BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Group: Applications/System diff --git a/genome-respin/repo/conf.d/cloud-ks.cfg b/genome-respin/repo/conf.d/cloud-ks.cfg index 255acd9..ed01ebd 100644 --- a/genome-respin/repo/conf.d/cloud-ks.cfg +++ b/genome-respin/repo/conf.d/cloud-ks.cfg @@ -74,6 +74,8 @@ sed -i "s/autosign = no/autosign = yes/g" /etc/certmaster/certmaster.conf /sbin/chkconfig --add httpd /sbin/chkconfig httpd on +/sbin/chkconfig NetworkManager off +/sbin/chkconfig network on /sbin/chkconfig genome-bridge on # Determine the operating system release and version |