From: Timo Eissler <timo@eissler.pro>
Date: Fri, 18 Jul 2014 05:50:24 +0000 (+0200)
Subject: bacula: several fixes
X-Git-Tag: v2.15-core82~6^2~28^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=859b0382ab8a52f72de86f13165df695672dfde3;p=ipfire-2.x.git

bacula: several fixes
---

diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula
index b9c8346beb..8fadc7abf4 100644
--- a/config/rootfiles/packages/bacula
+++ b/config/rootfiles/packages/bacula
@@ -15,9 +15,8 @@ etc/bacula/bacula-fd.conf
 #etc/bacula/mtx-changer
 #etc/bacula/mtx-changer.conf
 etc/rc.d/init.d/bacula
-#opt/bacula
-opt/bacula/working
-#root/.rnd
+#var/bacula
+var/bacula/working
 sbin/bacula-fd
 #sbin/bconsole
 #sbin/btraceback
diff --git a/lfs/bacula b/lfs/bacula
index 8d9631c930..54864b2295 100644
--- a/lfs/bacula
+++ b/lfs/bacula
@@ -80,6 +80,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && ./configure --enable-client-only
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	mv /sbin/bacula /etc/init.d/bacula
+	mv -f /sbin/bacula /etc/init.d/bacula
+	mv -f /opt/bacula /var/
+	sed -i -e 's#/opt/bacula/working#/var/bacula/working#' /etc/bacula/bacula-fd.conf
+	rm -f /root/.rnd
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 0f5a74f983..9361f78a5c 100755
--- a/make.sh
+++ b/make.sh
@@ -804,28 +804,6 @@ buildipfire() {
   ipfiremake stunnel
   ipfiremake sslscan
   ipfiremake bacula
-  echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
-  cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
-  echo >> $BASEDIR/build/var/ipfire/firebuild
-  git log -1 >> $BASEDIR/build/var/ipfire/firebuild
-  echo >> $BASEDIR/build/var/ipfire/firebuild
-  git status >> $BASEDIR/build/var/ipfire/firebuild
-  echo >> $BASEDIR/build/var/ipfire/firebuild
-  cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
-  echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
-  if [ "$(git status -s | wc -l)" == "0" ]; then
-	GIT_STATUS=""
-  else
-	GIT_STATUS="-dirty"
-  fi
-  case "$GIT_BRANCH" in
-	core*|beta?|rc?)
-	    echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH$GIT_STATUS" > $BASEDIR/build/etc/system-release
-	    ;;
-	*)
-	    echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" > $BASEDIR/build/etc/system-release
-	    ;;
-  esac
 }
 
 buildinstaller() {