diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2008-07-24 15:52:50 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2008-07-24 15:57:32 -0400 |
| commit | e7da05b82a597185a4ace203735029c37adbe6fb (patch) | |
| tree | 02c5cb5ef9d679a9e649bb2c94e631de08ceab56 | |
| parent | 48db9d1c5338a11ed08c10680b2aca416fbb7f7d (diff) | |
| download | tools-e7da05b82a597185a4ace203735029c37adbe6fb.tar.gz tools-e7da05b82a597185a4ace203735029c37adbe6fb.tar.xz tools-e7da05b82a597185a4ace203735029c37adbe6fb.zip | |
Removing genome-bridge's hardcoded eth0 setting
https://fedorahosted.org/genome/ticket/25
| -rw-r--r-- | genome-bridge/genome-bridge | 20 | ||||
| -rw-r--r-- | genome-bridge/genome-bridge.spec | 4 |
2 files changed, 18 insertions, 6 deletions
diff --git a/genome-bridge/genome-bridge b/genome-bridge/genome-bridge index e86311c..24a3905 100644 --- a/genome-bridge/genome-bridge +++ b/genome-bridge/genome-bridge @@ -13,16 +13,28 @@ . /etc/init.d/functions BRIDGE="genomebr0" +GATEWAY_DEVICE=`ip route | grep ^default | cut -f5 -d" "` + +status() { + /sbin/ifconfig $BRIDGE &> /dev/null +} case "$1" in start) + status + + if [ $? == 0 ]; then + echo "Bridge is already up" + exit 1 + fi + echo -n $"Starting genome-bridge: " touch /var/lock/subsys/genome-bridge - /usr/bin/pkill -f "dhclient eth0" + /usr/bin/pkill -f "dhclient $GATEWAY_DEVICE" /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 + /sbin/ifconfig $GATEWAY_DEVICE 0.0.0.0 promisc up + /usr/sbin/brctl addif $BRIDGE $GATEWAY_DEVICE /sbin/dhclient $BRIDGE #TODO: support static IPs RETVAL=$? ;; @@ -39,7 +51,7 @@ case "$1" in $0 start ;; status) - /sbin/ifconfig $BRIDGE &> /dev/null + status RETVAL=$? if [ $RETVAL == 0 ]; then echo "Bridge is up" diff --git a/genome-bridge/genome-bridge.spec b/genome-bridge/genome-bridge.spec index be8a3ac..394f2a8 100644 --- a/genome-bridge/genome-bridge.spec +++ b/genome-bridge/genome-bridge.spec @@ -1,6 +1,6 @@ Name: genome-bridge -Version: 1.0.0 -Release: 2%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: Genome network bridge Group: System Environment/Base License: GPLv2 |