--- toast-linux 2004/04/09 23:59:49 1.8 +++ toast-linux 2004/04/11 02:49:44 1.9 @@ -283,7 +283,7 @@ skel: !CONFIGURE! rm -fr $@ !CONFIGURE! $@ - mkdir -p $@/root/{root,proc,sys,tmp,mnt/{floppy,initrd,toast-root},var/{empty,run,log,lock},usr/man} + mkdir -p $@/root/{root,proc,sys,tmp,mnt/{floppy,root},var/{empty,run,log,lock},usr/man} for i in bin lib sbin share; do ln -sf usr/$$i $@/root/$$i; done ln -sf ../usr/share/zoneinfo/"`cat $@/root/etc/TZ`" $@/root/etc/localtime @@ -584,7 +584,7 @@ sys /sys sysfs rw 0 0 devpts /dev/pts devpts rw 0 0 /dev/fd0 /mnt/floppy vfat rw,noauto,sync 0 0 -/dev/toast/root /mnt/toast-root ext2 rw,noauto 0 0 +/dev/toast/root /mnt/root ext2 rw,noauto 0 0 --- FILE skel/root/etc/fstab.hd --- /dev/toast/root / ext3 rw 0 0 @@ -638,20 +638,11 @@ --- FILE skel/root/etc/inittab --- ::sysinit:/etc/init.d/rcS -::restart:/etc/init.d/pivot ::respawn:-/bin/sh ::ctrlaltdel:/sbin/reboot ::shutdown:/sbin/swapoff -a ::shutdown:/bin/umount -a -r ---- FILE skel/root/etc/inittab.hd --- -::sysinit:/etc/init.d/postpivot -::restart:/sbin/init -::respawn:-/bin/sh -::ctrlaltdel:/sbin/reboot -::shutdown:/sbin/swapoff -a -::shutdown:/bin/umount -a -r - --- FILE skel/root/etc/init.d/rcS --- #!/bin/sh devices @@ -660,33 +651,6 @@ hostname localhost autoinstall ---- FILE skel/root/etc/init.d/pivot --- -#!/bin/sh -PATH=/sbin:/bin -export PATH -mount -o remount / || exec /bin/sh -mount /mnt/toast-root || exec /bin/sh -umount /proc || exec /bin/sh -cd /mnt/toast-root || exec /bin/sh -pivot_root . mnt/initrd || exec /bin/sh -exec chroot . /sbin/init -exec /bin/sh - ---- FILE skel/root/etc/init.d/postpivot --- -#!/bin/sh -e -mount /proc -grep -v '^rootfs ' /proc/mounts > /etc/mtab -mount /sys -mount /dev/pts - -# TODO: fix "umount: device or resource busy", or just use chroot only.... -#umount /mnt/initrd -#rmdir /mnt/initrd -#freeramdisk /dev/ram0 - -swap -toaststrap - --- FILE skel/scripts/sbin/autoinstall --- #!/bin/sh -e echo "Configuring network." @@ -700,7 +664,9 @@ timeout 20 sh -ex /tmp/partition.tmp rm /tmp/partition.tmp +swap migrate +chroot /mnt/root toaststrap --- FILE skel/scripts/sbin/network --- #!/bin/sh @@ -834,7 +800,7 @@ --- FILE skel/scripts/sbin/migrate --- #!/bin/sh -target="/mnt/toast-root" +target="/mnt/root" dirs="" for i in `cd / && echo *`; do @@ -874,8 +840,6 @@ # TODO: adjust permissions -kill -HUP 1 - --- FILE skel/scripts/sbin/devices --- #!/bin/sh @@ -1424,7 +1388,7 @@ # busybox doesn't seem to include comm, and I'd just as soon avoid trying to # build real source packages with utoast. # Including bash because hardly anything will build with busybox ash alone. -# Including ncurses only because the bash binary supposedly requires it. +# Including ncurses only because the bash binary requires it. utoastdeb() { @@ -2850,7 +2814,7 @@ CONFIG_MKSWAP=y CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_PIVOT_ROOT=y +# CONFIG_PIVOT_ROOT is not set CONFIG_RDATE=y CONFIG_SWAPONOFF=y CONFIG_MOUNT=y