bacula: several fixes

diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula
index b9c8346beb1f531d7a16ecc7e6b07d97b91b795d..8fadc7abf49be25d19104fe4a67b87471e41f2f8 100644 (file)
--- 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 8d9631c9305e3778a84bd08f5bc929d799a0165d..54864b229595dfe1b81aaddbeb9357b23d9258ec 100644 (file)
--- 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 0f5a74f983352abfc613396ca0e71b7253af2474..9361f78a5ccbd0d779f4044ad0c7d608354a6c7f 100755 (executable)
--- 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() {