From 5415e8280f6595fd57c1adff1e87d6634cd8bba8 Mon Sep 17 00:00:00 2001
From: Ben Gras <ben@minix3.org>
Date: Tue, 3 May 2005 15:37:34 +0000
Subject: [PATCH] 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

---
 tools/Makefile      | 2 +-
 tools/chrootmake.sh | 4 ++--
 tools/issue.install | 3 +++
 tools/mkboot        | 4 ++--
 tools/release.sh    | 4 +++-
 5 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 tools/issue.install

diff --git a/tools/Makefile b/tools/Makefile
index 871b702cd..b5c4a70be 100755
--- 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 fbbd5c005..22aad1db2 100755
--- 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
index 000000000..8bb29591c
--- /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 37a094cff..0f022f2b1 100755
--- 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 6000e3936..fb87616a5 100755
--- 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