Installmake bearbeitet. (TESTING)

fstab gefixt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@341 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 011e29f922c84ba5d1cb3b63123e52bcf60a8956..1fef21a880d4c3679f4bf4bc34ac76fdb63c189c 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,57 @@
+------------------------------------------------------------------------
+r340 | ms | 2006-11-06 19:03:48 +0100 (Mon, 06 Nov 2006) | 2 lines
+
+Busybox war gegen falsche Libc gelinkt.
+
+------------------------------------------------------------------------
+r339 | ms | 2006-11-04 00:15:47 +0100 (Sat, 04 Nov 2006) | 2 lines
+
+Mailx und Newt Fixes.
+
+------------------------------------------------------------------------
+r338 | ms | 2006-11-03 00:59:32 +0100 (Fri, 03 Nov 2006) | 5 lines
+
+Zwischencommit...
+Typo von Meisterwinter behoben.
+Clamav Update.
+Neuen Source-Server unter source.ipfire.eu in Betrieb genommen.
+
+------------------------------------------------------------------------
+r337 | ms | 2006-11-02 20:00:22 +0100 (Thu, 02 Nov 2006) | 2 lines
+
+Zwischencommit... ISO wird gebaut!
+
+------------------------------------------------------------------------
+r336 | ms | 2006-11-02 14:08:47 +0100 (Thu, 02 Nov 2006) | 2 lines
+
+Buildfixes...
+
+------------------------------------------------------------------------
+r335 | ms | 2006-11-01 18:55:25 +0100 (Wed, 01 Nov 2006) | 2 lines
+
+Zwischencommit Rootfiles...
+
+------------------------------------------------------------------------
+r334 | ms | 2006-11-01 17:52:39 +0100 (Wed, 01 Nov 2006) | 3 lines
+
+Zwischencommit Rootfiles...
+Der Countdown laeuft...
+
+------------------------------------------------------------------------
+r333 | ms | 2006-10-30 21:23:28 +0100 (Mon, 30 Oct 2006) | 2 lines
+
+Zwischencommit Installer...
+
+------------------------------------------------------------------------
+r332 | ms | 2006-10-28 00:01:34 +0200 (Sat, 28 Oct 2006) | 2 lines
+
+Zwischencommit Installer.
+
+------------------------------------------------------------------------
+r331 | ms | 2006-10-27 17:50:54 +0200 (Fri, 27 Oct 2006) | 2 lines
+
+Busybox --> 1.2.2
+
 ------------------------------------------------------------------------
 r330 | ms | 2006-10-27 17:10:51 +0200 (Fri, 27 Oct 2006) | 2 lines
 

diff --git a/lfs/initrd b/lfs/initrd
index c0d71434028f869fa55b8232bb7e7d1b0d534610..3ef0bef885703ca9d16686ed0e715e2cc299c0c2 100644 (file)
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -57,8 +57,6 @@ $(TARGET) :
        cd /install/initrd && ln -sfn bin sbin
        cd /install/initrd/etc && rm -f fstab
        cp -aRf $(DIR_SRC)/config/install/* /install/initrd/etc/
-       mv -f /install/initrd/etc/fstab /install/initrd/etc/fstab.boot
-       cd /install/initrd/etc && ln -s /tmp/fstab fstab
        rm -rf /install/initrd/etc{,/udev,/udev/rules.d}/.svn
        rm -rf /install/initrd/usr/share/man
        chmod 755 /install/initrd/etc/halt /install/initrd/etc/rc

diff --git a/tools/make-functions b/tools/make-functions
index 451fde41561d96059d4cf0c4a364a05372503e78..91b85f63da38135a01941177452ef583cddc9cdf 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -412,7 +412,7 @@ installmake() {
        local PKG_TIME_START=`date +%s`
                chroot $LFS /tools/bin/env -i   HOME=/root \
                                                TERM=$TERM PS1='\u:\w\$ ' \
-                                               PATH=/opt/$MACHINE-uClibc/bin:/bin:/usr/bin:/sbin:/usr/sbin \
+                                               PATH=/opt/i586-uClibc/i586-linux-uclibc/bin:/opt/i586-uClibc/bin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
                                                VERSION=$VERSION \
                                                CONFIG_ROOT=$CONFIG_ROOT \
                                                LFS_PASS="install" \