]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Fixed Image build switch.
authorChristian Schmidt <maniacikarus@ipfire.org>
Sun, 25 Apr 2010 19:10:32 +0000 (21:10 +0200)
committerChristian Schmidt <maniacikarus@ipfire.org>
Sun, 25 Apr 2010 19:10:32 +0000 (21:10 +0200)
make.sh

diff --git a/make.sh b/make.sh
index a36a4a86c957a69ba41fe506317417adb85cf220..693a818b46fdec56a6e0bc4cda19d178b119b317 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -726,7 +726,7 @@ buildpackages() {
        ipfiremake cdrom ED=$IPFVER
 
   # Check if there is a loop device for building in virtual environments
        ipfiremake cdrom ED=$IPFVER
 
   # Check if there is a loop device for building in virtual environments
-  if [ $BUILD_IMAGES && -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
+  if [ $BUILD_IMAGES == 1 ] &&  ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
        ipfiremake usb-stick ED=$IPFVER
        ipfiremake flash-images ED=$IPFVER
   fi
        ipfiremake usb-stick ED=$IPFVER
        ipfiremake flash-images ED=$IPFVER
   fi
@@ -736,7 +736,7 @@ buildpackages() {
   ipfirepackages
 
   # Check if there is a loop device for building in virtual environments
   ipfirepackages
 
   # Check if there is a loop device for building in virtual environments
-  if [ $BUILD_IMAGES && -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
+  if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
         cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
         cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
        ipfiremake xen-image ED=$IPFVER
         cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
         cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
        ipfiremake xen-image ED=$IPFVER