Handle $PREFIX and $BRIDGE in ifcfg-xenbr0 and libvirt.debian.init

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/ifcfg-xenbr0 b/ifcfg-xenbr0
index fe183d50f25dcc63cd1a5740b3a0b93de664ee29..3e814958c1cfb0e8d39956a1bf16793f5867e7b6 100644 (file)
--- 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 93e863375204ff6c007f92be4032d9fd1fedf0ec..00ba119f6f45849892eeafa2a9034fbaddeb9845 100644 (file)
--- 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 8006cdc2d85f093502fef4c7ce13cde87dea4150..c1bd265657c25d0e1970f3df5b13bd00f944abe7 100644 (file)
--- 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 3d97eb9e281a0e76d505dc0194ae2b718190934c..b6557ac52b76592c7e907927496ec6649eefd598 100644 (file)
--- 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