--- toast-linux 2004/10/10 00:10:38 1.124
+++ toast-linux 2004/10/13 05:15:46 1.125
@@ -336,7 +336,7 @@
root: $(LINUX) symbols !CONFIGURE!
rm -fr $@
!CONFIGURE! $@
- mkdir -p $@/{root,proc,sys,tmp,mnt/{floppy,root},var/run}
+ mkdir -p $@/{root,proc,sys,tmp,media/floppy,mnt,var/run}
ln -s . $@/usr
install -D $(TOOLCHAIN_LIB_DIR)/ld-uClibc.so.0 $@/lib/ld-uClibc.so.0
install -D $(TOOLCHAIN_LIB_DIR)/libdl.so.0 $@/lib/libdl.so.0
@@ -740,141 +740,29 @@
DISKS=hda,hdb,sda install on specified disks only
DESTROY=yes overwrite existing disk contents
---- FILE root/etc/passwd ---
-root:x:0:0:root:/root:/bin/zsh
-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/zsh
-nobody:x:99:99:nobody:/:/bin/false
-
---- FILE 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 root/etc/hosts ---
127.0.0.1 localhost
---- FILE root/etc/host.conf ---
-order hosts,bind
-multi on
-
---- FILE root/etc/nsswitch.conf ---
-hosts: files dns
-
--- FILE root/etc/resolv.conf ---
nameserver 205.217.153.34
--- FILE root/etc/TZ ---
PST8PDT
---- FILE root/etc/ld.so.conf ---
-
--- FILE root/etc/lvm/lvm.conf ---
devices { sysfs_scan=0 }
---- FILE root/etc/syslog.conf ---
-*.* /var/log/syslog
-
--- FILE root/etc/fstab ---
-/dev/ram0 / ext2 rw 0 0
-proc /proc proc rw 0 0
-sys /sys sysfs rw 0 0
-/dev/fd0 /mnt/floppy vfat rw,noauto,sync 0 0
-/dev/toast/root /mnt/root ext2 rw,noauto 0 0
-/dev/toast/boot /mnt/root/boot ext2 rw,noauto 0 0
-proc /mnt/root/proc proc rw,noauto 0 0
-sys /mnt/root/sys sysfs rw,noauto 0 0
+/dev/ram0 / ext2 rw 0 0
+proc /proc proc rw 0 0
+sys /sys sysfs rw 0 0
+/dev/fd0 /media/floppy vfat rw,noauto,sync 0 0
---- FILE root/etc/fstab.hd ---
-/dev/toast/root / ext3 rw 0 0
-/dev/toast/boot /boot ext3 rw 0 0
-proc_ /proc proc rw 0 0
-sys_ /sys sysfs rw 0 0
-dev_ /dev devfs rw 0 0
-dev_pts_ /dev/pts devpts rw 0 0
-/dev/fd0 /mnt/floppy auto rw,noauto,sync 0 0
-
--- FILE root/etc/mtab ---
/dev/ram0 / ext2 rw 0 0
---- FILE root/etc/mtab.hd ---
-/dev/ram0 / ext2 rw 0 0
-
---- FILE root/etc/filesystems ---
-vfat
-*
-
---- FILE root/etc/lilo.conf ---
-boot = /dev/hda
-root = /dev/ram0
-initrd = /boot/initrd.gz
-delay = 40
-lba32
-read-write
-
-image = /boot/vmlinuz
-label = toast
-
-image = /boot/vmlinuz.off
-label = oldkernel
-optional
-
-image = /boot/vmlinuz.off.off
-label = olderkernel
-optional
-
-image = /boot/vmlinuz
-initrd = /boot/initrd.gz.off
-label = oldinitrd
-optional
-
-image = /boot/vmlinuz
-initrd = /boot/initrd.gz.off.off
-label = olderinitrd
-optional
-
-image = /boot/vmlinuz.off
-initrd = /boot/initrd.gz.off
-label = oldkoldi
-optional
-
--- FILE root/etc/profile ---
-PS1='\u@\h:\w\$ '
+PS1='\h:\w\$ '
--- FILE root/etc/inittab ---
::sysinit:/etc/init.d/rc.start
@@ -895,8 +783,6 @@
--- FILE root/etc/init.d/rc.stop ---
#!/bin/sh
swapoff -a
-[ -d /mnt/root/proc/1 ] && umount /mnt/root/proc
-[ -d /mnt/root/sys/class ] && umount /mnt/root/sys
umount -a -r
--- FILE root/etc/init.d/rc.main ---
@@ -1245,7 +1131,8 @@
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_LOOP is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_SX8 is not set
CONFIG_BLK_DEV_RAM=y
@@ -2063,6 +1950,7 @@
#
# test (forced enabled for use with shell)
#
+# CONFIG_FEATURE_TEST_64 is not set
CONFIG_TOUCH=y
CONFIG_TR=y
CONFIG_TRUE=y
@@ -2288,6 +2176,7 @@
CONFIG_ASH_JOB_CONTROL=y
# CONFIG_ASH_ALIAS is not set
CONFIG_ASH_MATH_SUPPORT=y
+# CONFIG_ASH_MATH_SUPPORT_64 is not set
# CONFIG_ASH_GETOPTS is not set
# CONFIG_ASH_CMDCMD is not set
# CONFIG_ASH_MAIL is not set
@@ -2323,13 +2212,14 @@
# CONFIG_FDFLUSH is not set
# CONFIG_FDFORMAT is not set
# CONFIG_FDISK is not set
+FDISK_SUPPORT_LARGE_DISKS=y
# CONFIG_FREERAMDISK is not set
# CONFIG_FSCK_MINIX is not set
# CONFIG_MKFS_MINIX is not set
# CONFIG_GETOPT is not set
# CONFIG_HEXDUMP is not set
# CONFIG_HWCLOCK is not set
-# CONFIG_LOSETUP is not set
+CONFIG_LOSETUP=y
CONFIG_MKSWAP=y
# CONFIG_MORE is not set
# CONFIG_PIVOT_ROOT is not set
@@ -2343,7 +2233,7 @@
#
# Common options for mount/umount
#
-# CONFIG_FEATURE_MOUNT_LOOP is not set
+CONFIG_FEATURE_MOUNT_LOOP=y
CONFIG_FEATURE_MTAB_SUPPORT=y
CONFIG_FEATURE_MTAB_FILENAME="/etc/mtab"