More polishing to the boot and release process. Highlights:

	. Less dependency on scripts to be executable (they're in cvs)
	. issue.install is the /etc/issue that goes on an install CD
	  for instructions (but not on the installed system)
	. /usr/src goes on the CD uncompressed

diff --git a/tools/Makefile b/tools/Makefile
index 871b702cdef4ed163de0121612e135c78af5beef..b5c4a70be7faad38f57737c309025c0122307308 100755 (executable)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -8,7 +8,7 @@ MAKE=   exec make -$(MAKEFLAGS)
 
 # specify the programs that are part of the system image
 PROGRAMS=      ../kernel/kernel \
-       ../servers/mm/mm \
+       ../servers/pm/pm \
        ../servers/fs/fs \
        ../servers/is/is \
        ../drivers/tty/tty \

diff --git a/tools/chrootmake.sh b/tools/chrootmake.sh
index fbbd5c0052a9fb3a227f2a4f5f9958d3803ed778..22aad1db247c40cc2c24b94fd554b1872edeadbe 100755 (executable)
--- a/tools/chrootmake.sh
+++ b/tools/chrootmake.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 cd /usr || exit 1
-tar cf - src | compress >src.tar.z || exit 1
 cd /usr/src || exit 1
 make world install || exit 1
 cd tools || exit 1
 make hdboot || exit 1
 cp ../boot/boot /boot/boot || exit 1
 cd /usr || exit 1
-rm -rf /usr/src || exit 1
+cd /usr/src || exit 1
+make clean
 exit 0
 

diff --git a/tools/issue.install b/tools/issue.install
new file mode 100644 (file)
index 0000000..8bb2959
--- /dev/null
+++ b/tools/issue.install
@@ -0,0 +1,3 @@
+
+Login as root and run 'setup' to install Minix.
+

diff --git a/tools/mkboot b/tools/mkboot
index 37a094cff6cdbab3662cd49e8616c4ca7e326f64..0f022f2b15127cc8ea890cb4c54e32018766b25f 100755 (executable)
--- a/tools/mkboot
+++ b/tools/mkboot
@@ -61,7 +61,7 @@ hdboot)
                    "exec mv $rootdir/M $rootdir/boot/image/`uname -r`.`uname -v`"
        fi
 
-       ./tell_config OS_RELEASE . OS_VERSION >/tmp/mkb.$$
+       sh tell_config OS_RELEASE . OS_VERSION >/tmp/mkb.$$
        version=`sed 's/["      ]//g;/^$/d' </tmp/mkb.$$`
 
        revision=`cat revision 2>/dev/null`
@@ -160,7 +160,7 @@ cdfdboot)
        cp -p ../boot/boot /mnt/boot/boot || exit 1
        umount $dev || exit 1
        installboot -d $dev ../boot/bootblock boot/boot || exit 1
-       edparams $dev 'unset bootopts; unset servers; unset image; ramimagedev=c0d2p1; unset rootdev; unset leader; leader() { echo If the system cannot find root, please hit ESC and set your\nramimagedev to the CD device, partition 1. e.g.\nramimagedev=c0d2p1 .. then boot to start.\n }; bootcd=1; main(){delay 10000;boot}; save' || exit
+       edparams $dev 'unset bootopts; unset servers; unset image; ramimagedev=c0d2p1; unset rootdev; unset leader; leader() { echo If the system cannot find root, please hit ESC and set your\nramimagedev to the CD device, partition 1. e.g.\nramimagedev=c0d2p1 .. then boot to start.\n\nOtherwise I will boot with my defaults in 10 seconds.\n\n }; bootcd=1; main(){delay 10000;boot}; save' || exit
 
        # copy image
        dd if=$dev of=cdfdimage bs=8192 count=180

diff --git a/tools/release.sh b/tools/release.sh
index 6000e3936bb1e724397e6bc1147e1b29455d8e87..fb87616a5e3ccdd99f595bdbad733bbd32e2d177 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -55,10 +55,12 @@ mkdir -p $RELEASEDIR/tmp
 mkdir -p $RELEASEDIR/usr/tmp
 echo " * Transfering $COPYITEMS to $RELEASEDIR"
 ( cd / && tar cf - $COPYITEMS ) | ( cd $RELEASEDIR && tar xf - ) || exit 1
+date >$RELEASEDIR/CD
 ( cd $RELEASEDIR && find . -name CVS | xargs rm -rf )
 echo " * Chroot build"
 chroot $RELEASEDIR '/bin/sh -x /usr/src/tools/chrootmake.sh' || exit 1
 echo " * Chroot build done"
+cp issue.install $RELEASEDIR/etc/issue
 umount $TMPDISK || exit
 umount $TMPTMPDISK || exit
 umount $RAM || exit
@@ -66,7 +68,7 @@ cp $RAM $ROOTIMAGE
 make programs image
 (cd ../boot && make)
 make image || exit 1
-./mkboot cdfdboot
+sh mkboot cdfdboot
 writeisofs -l MINIX -b $IMAGE /tmp $ISO || exit 1
 echo "Appending Minix root filesystem"
 cat >>$ISO $ROOTIMAGE || exit 1