From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Fri, 20 Mar 2015 15:36:32 +0000 (+0000)
Subject: Fix installation
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2e6caf0fdbf8bf307a6aa1033ef6685543a0757c;p=raisin.git

Fix installation

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

diff --git a/build.sh b/build.sh
index d011585..9bebe43 100755
--- a/build.sh
+++ b/build.sh
@@ -93,7 +93,7 @@ TMPFILE=`mktemp`
 cd $INST_DIR
 find . > $TMPFILE
 $SUDO mv $TMPFILE /var/log/raixen.log
-$SUDO mv -f * /
+$SUDO cp -ar * /
 
 # configure
 if test "$XEN_UPSTREAM_REVISION"
@@ -108,3 +108,5 @@ if test "$LIBVIRT_UPSTREAM_REVISION"
 then
     libvirt_configure
 fi
+
+rm -rf $INST_DIR
diff --git a/libvirt.sh b/libvirt.sh
index 3db52c1..6cc4ee0 100644
--- a/libvirt.sh
+++ b/libvirt.sh
@@ -42,13 +42,14 @@ function libvirt_build() {
     $MAKE --ignore-errors install DESTDIR="$INST_DIR"
     if test $DISTRO = "Debian"
     then
-        cat ../libvirt.debian.init | sed -e "s/@PREFIX/$PREFIX/g" > "$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
         $MAKE -C daemon libvirtd.init
-        cp daemon/libvirtd.init $INST_DIR/etc/init.d/libvirtd
-        chmod +x "$INST_DIR"/etc/init.d/libvirtd
+        mkdir -p "$INST_DIR"/etc/rc.d/init.d
+        cp daemon/libvirtd.init "$INST_DIR"/etc/rc.d/init.d/libvirtd
+        chmod +x "$INST_DIR"/etc/rc.d/init.d/libvirtd
     else
         echo "I don't know how write an init script for Libvirt on $DISTRO"
     fi