From fe5c8714d7aea06fd45eadcd62753cbecf8b34a8 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Thu, 19 Mar 2015 16:33:28 +0000 Subject: [PATCH] Handle $PREFIX and $BRIDGE in ifcfg-xenbr0 and libvirt.debian.init Signed-off-by: Stefano Stabellini --- ifcfg-xenbr0 | 2 +- libvirt.debian.init | 2 +- libvirt.sh | 2 +- xen.sh | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ifcfg-xenbr0 b/ifcfg-xenbr0 index fe183d5..3e81495 100644 --- a/ifcfg-xenbr0 +++ b/ifcfg-xenbr0 @@ -1,4 +1,4 @@ -DEVICE=xenbr0 +DEVICE=@BRIDGE TYPE=Bridge BOOTPROTO=dhcp ONBOOT=yes diff --git a/libvirt.debian.init b/libvirt.debian.init index 93e8633..00ba119 100644 --- a/libvirt.debian.init +++ b/libvirt.debian.init @@ -19,7 +19,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin export PATH -DAEMON=/usr/local/sbin/libvirtd +DAEMON=@PREFIX/sbin/libvirtd NAME=libvirtd DESC="libvirt management daemon" diff --git a/libvirt.sh b/libvirt.sh index 8006cdc..c1bd265 100644 --- a/libvirt.sh +++ b/libvirt.sh @@ -42,7 +42,7 @@ function libvirt_build() { $MAKE --ignore-errors install DESTDIR="$INST_DIR" if test $DISTRO = "Debian" then - cp ../libvirt.debian.init "$INST_DIR"/etc/init.d/libvirtd + cat ../libvirt.debian.init | sed -e "s/@PREFIX/$PREFIX/g" > "$INST_DIR"/etc/init.d/libvirtd chmod +x "$INST_DIR"/etc/init.d/libvirtd elif test $DISTRO = "Fedora" || test $DISTRO = "CentOS" then diff --git a/xen.sh b/xen.sh index 3d97eb9..b6557ac 100644 --- a/xen.sh +++ b/xen.sh @@ -92,7 +92,8 @@ function xen_create_bridge_Fedora() { echo "BRIDGE=$BRIDGE" >> $TMPFILE $SUDO mv -f $TMPFILE $IFACE - $SUDO cp ifcfg-xenbr0 /etc/sysconfig/network-scripts + cat ifcfg-xenbr0 | sed -e "s/@BRIDGE/$BRIDGE/g" > $TMPFILE + $SUDO mv -f $TMPFILE /etc/sysconfig/network-scripts $SUDO iptables -I FORWARD -m physdev --physdev-is-bridged -j ACCEPT $SUDO service iptables save -- 2.39.5