Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

diff --git a/lfs/fireinfo b/lfs/fireinfo
index a0aafbf5bcd6b452c0259b8cd63058960fc9813e..a4cd8819da3cb37353e598575a2ae2fe71acb57c 100644 (file)
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.3
+VER        = 0.5
 
 THISAPP    = fireinfo-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2105bf88213dfd2198891a96eeb08949
+$(DL_FILE)_MD5 = 2eb12d3c4aeda93ee184a85b1e8b6a96
 
 install : $(TARGET)
 

diff --git a/tools/make-functions b/tools/make-functions
index de79dba0d744eead9b6dd2931b8406783becc68c..2bd85f166a6617df86102a92ec767f7a2fb94a5e 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -265,7 +265,7 @@ entershell() {
                exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/"
        fi
        echo "Entering to a shell inside LFS chroot, go out with exit"
-       chroot $LFS /tools/bin/env -i HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
+       $linux32 chroot $LFS /tools/bin/env -i HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
                PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
                VERSION=$VERSION CONFIG_ROOT=$CONFIG_ROOT \
                NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \