--- toast-linux	2004/04/07 22:11:40	1.5
+++ toast-linux	2004/04/09 00:05:07	1.6
@@ -513,11 +513,49 @@
 
 --- FILE skel/root/etc/passwd ---
 root:x:0:0:root:/root:/bin/sh
+bin:x:1:1:bin:/bin:/bin/false
+daemon:x:2:2:daemon:/sbin:/bin/false
+adm:x:3:4:adm:/var/adm:/bin/false
+lp:x:4:7:lp:/var/spool/lpd:/bin/false
+sync:x:5:0:sync:/sbin:/bin/sync
+shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
+halt:x:7:0:halt:/sbin:/sbin/halt
+mail:x:8:12:mail:/var/spool/mail:/bin/false
+news:x:9:13:news:/var/spool/news:/bin/false
+uucp:x:10:14:uucp:/var/spool/uucp:/bin/false
+operator:x:11:0:operator:/root:/bin/false
+games:x:12:100:games:/usr/games:/bin/false
+ftp:x:14:50:FTP User:/home/ftp:/bin/false
 toast:x:42:42:toast:/toast:/bin/sh
+nobody:x:99:99:nobody:/:/bin/false
 
 --- FILE skel/root/etc/group ---
 root:x:0:root
+bin:x:1:bin
+daemon:x:2:daemon
+sys:x:3:sys
+adm:x:4:adm
+tty:x:5:
+disk:x:6:
+lp:x:7:lp
+mem:x:8:
+kmem:x:9:
+wheel:x:10:
+mail:x:12:mail
+news:x:13:news
+uucp:x:14:uucp
+man:x:15:
+floppy:x:19:
+games:x:20:games
+slocate:x:21:
+utmp:x:22:
+squid:x:23:
+gopher:x:30:
 toast:x:42:toast
+ftp:x:50:
+nobody:x:99:
+users:x:100:
+nofiles:x:65533:
 
 --- FILE skel/root/etc/hosts ---
 127.0.0.1 localhost
@@ -1406,7 +1444,7 @@
 # Note that utoast currently needs make in order to install toast.
 
 utoast make 3.80 http://ftp.gnu.org/gnu/make/make-3.80.tar.bz2
-utoast toast 1.314 http://toastball.net/toast/toast-1.314.tar.gz
+utoast toast 1.317 http://toastball.net/toast/toast-1.317.tar.gz
 
 # Step 3: Replace all binary packages from step 1 with source packages.
 # Everything compiled from source prior to this point will need to be rebuilt
@@ -1437,35 +1475,46 @@
 toast remove deb-binutils
 toast arm http://ftp.gnu.org/gnu/bash/bash-2.05b.tar.gz
 toast rebuild glibc gcc binutils coreutils make gawk toast
-# perl must be rebuilt in separate invocation of toast; otherwise toast will
-# continue running without knowing the correct location of perl
+# Perl must be rebuilt in separate invocation of toast; otherwise toast will
+# continue running without knowing the correct location of perl:
 toast rebuild perl
-toast remove deb-bash deb-ncurses deb-glibc
+toast remove deb-ncurses deb-glibc deb-bash
+# When compiled from source, bash doesn't create a /bin/sh symlink, which
+# means that /bin/sh is now busybox ash again, which won't work.  Fix it:
+ln -sf bash /bin/sh
+# While we're at it, util-linux expects to be able to compile C with "cc":
+ln -sf gcc /bin/cc
 
 # Step 4: Replace busybox with full GNU/Linux tools.
 
 toast arm http://ftp.gnu.org/gnu/sed/sed-4.0.9.tar.gz
 toast arm http://kernel.org/pub/linux/utils/util-linux/util-linux-2.11z.tar.bz2
 toast arm http://kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.0.tar.bz2
+toast arm http://ftp.gnu.org/gnu/ncurses/ncurses-5.4.tar.gz
 toast arm http://procps.sourceforge.net/procps-3.1.15.tar.gz
 toast arm ftp://alpha.gnu.org/gnu/tar/tar-1.13.25.tar.gz
 toast arm http://ftp.gnu.org/gnu/gzip/gzip-1.2.4a.tar.gz
-toast arm http://mirrors.kernel.org/sources.redhat.com/bzip2/v102/bzip2-1.0.2.tar.gz
 toast arm http://ftp.gnu.org/gnu/patch/patch-2.5.4.tar.gz
-toast arm http://ftp.gnu.org/gnu/findutils/findutils-4.1.tar.gz
+toast arm [ http://ftp.gnu.org/gnu/findutils/findutils-4.1.tar.gz http://www.linuxfromscratch.org/findutils-4.1.patch ]
 toast arm http://ftp.gnu.org/gnu/grep/grep-2.5.tar.bz2
 toast arm ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.85.tar.gz
-toast arm http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.4.1.tar.gz
 toast arm http://www.ibiblio.org/pub/Linux/system/hardware/hdparm-5.5.tar.gz
-toast arm http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-1.60.tar.bz2
 toast arm http://ftp.gnu.org/gnu/inetutils/inetutils-1.4.2.tar.gz
 toast arm http://ftp.gnu.org/gnu/wget/wget-1.9.1.tar.gz
 toast arm http://udhcp.busybox.net/source/udhcp-0.9.8.tar.gz
-toast remove busybox
+toast arm http://ftp.gnu.org/gnu/diffutils/diffutils-2.8.1.tar.gz
+toast arm ftp://ftp.vim.org/pub/vim/unix/vim-6.2.tar.bz2
+toast remove busybox disk-utils
+# Now that uClibc is gone, it's safe to re-enable the LD_PRELOAD hack,
+# which is good because a few packages need it in order to install properly:
+unset TOAST_PRELOAD
+toast arm http://mirrors.kernel.org/sources.redhat.com/bzip2/v102/bzip2-1.0.2.tar.gz
+toast arm http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.4.1.tar.gz
+toast arm http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-1.60.tar.bz2
 
 # Step 5: Install what we will need in order to make the system usable.
 
-toast arm [ http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.4.tar.bz2 http://toastball.net/toast-linux-tmp/linux-2.6.4-config.tar.gz ]
+toast arm [ http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.5.tar.bz2 http://toastball.net/toast-linux-tmp/linux-2.6.5-config.tar.gz ]
 toast arm ftp://ftp.sistina.com/pub/LVM2/device-mapper/device-mapper.1.00.07.tgz
 toast arm ftp://ftp.sistina.com/pub/LVM2/tools/LVM2.2.00.08.tgz
 toast arm lilo/22.5.8+devmapper: [ http://home.san.rr.com/johninsd/pub/linux/lilo/lilo-22.5.8.tar.gz http://www.saout.de/misc/lilo-22.5.8-devmapper.patch ]
@@ -1478,8 +1527,6 @@
 
 toast arm http://kernel.org/pub/linux/docs/manpages/man-pages-1.65.tar.bz2
 toast arm http://www.libpng.org/pub/png/src/zlib-1.2.1.tar.gz
-toast arm http://ftp.gnu.org/gnu/ncurses/ncurses-5.3.tar.bz2
-toast arm ftp://ftp.vim.org/pub/vim/unix/vim-6.2.tar.bz2
 toast arm http://ftp.gnu.org/gnu/m4/m4-1.4.tar.gz
 toast arm http://ftp.gnu.org/gnu/bison/bison-1.875.tar.bz2
 toast arm http://www.greenwoodsoftware.com/less/less-381.tar.gz
@@ -1491,7 +1538,6 @@
 toast arm http://ftp.gnu.org/gnu/automake/automake-1.8.2.tar.gz
 toast arm ftp://ftp.astron.com/pub/file/file-4.07.tar.gz
 toast arm http://ftp.gnu.org/gnu/libtool/libtool-1.5.2.tar.gz
-toast arm http://ftp.gnu.org/gnu/diffutils/diffutils-2.8.1.tar.gz
 toast arm http://ftp.gnu.org/gnu/ed/ed-0.2.tar.gz
 toast arm ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/kbd-1.12.tar.gz
 toast arm http://kernel.org/pub/linux/utils/man/man-1.5m2.tar.bz2
@@ -1501,7 +1547,6 @@
 
 toast arm http://archive.progeny.com/zsh/zsh-4.1.1.tar.bz2
 toast arm http://ftp.gnu.org/gnu/parted/parted-1.6.6.tar.gz
-toast disarm disk-utils
 
 # Step 8: Remove the last traces of the installer, including this script.