From 4d7cc8e5b61d3bbb186eeca300e8f360c2a58974 Mon Sep 17 00:00:00 2001 From: gdr-ftp Date: Mon, 15 Feb 1999 21:39:11 +0000 Subject: [PATCH] fudgeinstall: - msort doesn't read stdin. Use a temporary file instead - install support files for newuser(8) - install TMTerm, /etc/hosts, /etc/networks, /usr/sbin/slpscrpt.direct mkboot: - create the script /tmp/mklinks on the gno.boot volume. This script creates the duplicate files that should be symlinks to other programs (newuserv --> newuser, for example). The script will be run by installboot1 mkdisk1: - don't ship /gno/install. Do ship /gno/Icons and /gno/System --- build.tools/fudgeinstall | 26 ++++++++++++++++++++++---- build.tools/mkboot | 16 +++++++++++++--- build.tools/mkdisk1 | 4 ++-- 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/build.tools/fudgeinstall b/build.tools/fudgeinstall index 46bd2ee..877a424 100755 --- a/build.tools/fudgeinstall +++ b/build.tools/fudgeinstall @@ -6,7 +6,7 @@ # # Devin Reade, September 1997. # -# $Id: fudgeinstall,v 1.8 1999/01/28 06:54:31 gdr-ftp Exp $ +# $Id: fudgeinstall,v 1.9 1999/02/15 21:39:11 gdr-ftp Exp $ # What is our release directory? (The second one must be HFS, and # may be the same as the first.) @@ -27,6 +27,11 @@ setenv DIST /dist # their resource forks (unless we were to binscii them) setenv BINSRC /scratch/gnoboot.bins +# We need a scratch file for some operations +setenv JUNKFILE /tmp/finstall.junk + +#================================== + # Create the directories we need. Unfortunately, gsh is too stupid to # even allow us multiline commands by escaping the newline, so we have # to call install many times. @@ -83,6 +88,7 @@ install -dV $RELDIR/usr/man/cat8 install -dV $RELDIR/usr/orca/bin install -dV $RELDIR/usr/sbin install -dV $RELDIR/var/adm +install -dV $RELDIR/var/adm/newuser/skel install -dV $RELDIR/var/run install -dV $RELDIR/var/spool @@ -98,9 +104,12 @@ install -V /HFSinclude/sys/*.h $RELDIR2/HFSinclude/sys echo "installing files in /Icons" install -V $BINSRC/Icons/GNO.Icon $RELDIR/Icons +# These ones should eventually be installed as part of the 'release' +# target. echo "installing files in /System" install -V $BINSRC/System/Desk.Accs/GNOSnooperII $RELDIR/System/Desk.Accs install -V $BINSRC/System/Desk.Accs/SuspDA $RELDIR/System/Desk.Accs +install -V $BINSRC/System/Desk.Accs/TMTerm2.v1.0 $RELDIR/System/Desk.Accs/TMTerm install -V $BINSRC/System/Drivers/FilePort $RELDIR/System/Drivers install -V $BINSRC/System/Drivers/FilePort.Data $RELDIR/System/Drivers install -V $BINSRC/System/Drivers/NullPort $RELDIR/System/Drivers @@ -172,11 +181,13 @@ install -V /etc/freeze.cnf $RELDIR/etc # gettytab done install -V $SRC/gno/verbatim/etc/glogin $RELDIR/etc install -V $SRC/gno/verbatim/etc/group $RELDIR/etc +install -V $SRC/gno/verbatim/etc/hosts $RELDIR/etc install -V $SRC/gno/verbatim/etc/inittab $RELDIR/etc install -V $SRC/gno/verbatim/etc/motd $RELDIR/etc echo >> $RELDIR/etc/motd echo -n 'GNO release build date: ' >> $RELDIR/etc/motd date >> $RELDIR/etc/motd +install -V $SRC/gno/verbatim/etc/networks $RELDIR/etc install -V $SRC/gno/verbatim/etc/namespace $RELDIR/etc install -V $SRC/gno/verbatim/etc/passwd $RELDIR/etc install -V $SRC/gno/verbatim/etc/rchost $RELDIR/etc @@ -327,11 +338,17 @@ install -V /usr/sbin/initd $RELDIR/usr/sbin install -V /usr/sbin/lpd $RELDIR/usr/sbin # makewhatis done install -V /usr/sbin/mktmp $RELDIR/usr/sbin -install -V /usr/sbin/newuser $RELDIR/usr/sbin -install -V /usr/sbin/newuserv $RELDIR/usr/sbin +# newuser done +# newuserv done install -V /usr/sbin/runover $RELDIR/usr/sbin +install -V $SRC/gno/verbatim/usr/sbin/slpscrpt.direct $RELDIR/usr/sbin install -V /usr/sbin/uptimed $RELDIR/usr/sbin +echo "installing files in /var/adm/newuser" +install -V $SRC/gno/verbatim/var/adm/newuser/newid $RELDIR/var/adm/newuser +install -V $SRC/gno/verbatim/var/adm/newuser/skel/glogin $RELDIR/var/adm/newuser/skel +install -V $SRC/gno/verbatim/var/adm/newuser/skel/gshrc $RELDIR/var/adm/newuser/skel + echo "creating log files" touch $RELDIR/var/adm/messages touch $RELDIR/var/adm/debug @@ -343,7 +360,8 @@ chtyp -tbin -a0 $RELDIR/var/adm/utmp $RELDIR/var/adm/wtmp $RELDIR/var/adm/lastlo # all of the others. echo "creating the /usr/man/mkso.data file" install $SRC/gno/usr.man/mkso.data $RELDIR/usr/man/mkso.data -cat $DIST/install/mkso.* | egrep -v -e '^#' | msort >> $RELDIR/usr/man/mkso.data +cat $DIST/install/mkso.* | egrep -v -e '^#' > $JUNKFILE +msort $JUNKFILE >> $RELDIR/usr/man/mkso.data # We won't use these directories, but they should be created for the user echo "creating /usr/local hierarchy" diff --git a/build.tools/mkboot b/build.tools/mkboot index c64f431..09ee9b6 100755 --- a/build.tools/mkboot +++ b/build.tools/mkboot @@ -5,7 +5,7 @@ # # Devin Reade, April 1998. # -# $Id: mkboot,v 1.4 1999/01/28 06:54:31 gdr-ftp Exp $ +# $Id: mkboot,v 1.5 1999/02/15 21:39:11 gdr-ftp Exp $ # What is our release directory? (The second one must be HFS, and # may be the same as the first.) @@ -15,6 +15,7 @@ setenv RELBOOT /gno.boot # Where are the GNO (and other) sources? setenv SRC /src +setenv DIST /dist # Where do we keep the Finder.Data, Finder.Root, and icons files # that are created on the GS and copied over to the GNO boot disk? @@ -22,6 +23,10 @@ setenv SRC /src # their resource forks (unless we were to binscii them) setenv BINSRC /scratch/gnoboot.bins +# We need two scratch files for some operations +setenv JUNKFILE1 /tmp/finstall.junk1 +setenv JUNKFILE2 /tmp/finstall.junk2 + #================================== echo "creating directories ..." @@ -74,7 +79,13 @@ install -V $BINSRC/Finder.Root $RELBOOT install -V $BINSRC/Finder.Data $RELBOOT install -V $BINSRC/Icons/GNO.Icon $RELBOOT/Icons -chtyp -lexec $RELBOOT/gshrc $RELBOOT/installboot* +echo "creating the mklinks script" +echo '/^\#/d' > $JUNKFILE1 +echo 's/^/install -V /' >> $JUNKFILE1 +cat $DIST/install/mklink.* | sed -f $JUNKFILE1 > $JUNKFILE2 +msort $JUNKFILE2 > $RELBOOT/tmp/mklinks + +chtyp -lexec $RELBOOT/gshrc $RELBOOT/installboot* $RELBOOT/tmp/mklinks echo "installing temporary files since gshk will not archive empty directories" install $SRC/gno/verbatim/tmp/delete.me $RELBOOT/doc @@ -83,6 +94,5 @@ install $SRC/gno/verbatim/tmp/delete.me $RELBOOT/lang/orca/languages install $SRC/gno/verbatim/tmp/delete.me $RELBOOT/lang/orca/shell install $SRC/gno/verbatim/tmp/delete.me $RELBOOT/lang/orca/utilities install $SRC/gno/verbatim/tmp/delete.me $RELBOOT/lib -install $SRC/gno/verbatim/tmp/delete.me $RELBOOT/tmp install $SRC/gno/verbatim/tmp/delete.me $RELBOOT/usr/bin install $SRC/gno/verbatim/tmp/delete.me $RELBOOT/var/adm diff --git a/build.tools/mkdisk1 b/build.tools/mkdisk1 index 9077ac5..9c8a6de 100755 --- a/build.tools/mkdisk1 +++ b/build.tools/mkdisk1 @@ -5,7 +5,7 @@ # # Devin Reade, April 1998 # -# $Id: mkdisk1,v 1.1 1998/04/22 04:51:10 gdr-ftp Exp $ +# $Id: mkdisk1,v 1.2 1999/02/15 21:39:11 gdr-ftp Exp $ # What is our release directory? (The second one must be HFS, and # may be the same as the first.) @@ -113,7 +113,7 @@ mv $RELDIR/usr $RELDIR/gno.15 echo gno.16 install -d $RELDIR/gno.16 -mv $RELDIR/dev $RELDIR/doc $RELDIR/etc $RELDIR/home $RELDIR/install $RELDIR/lang $RELDIR/sbin $RELDIR/var $RELDIR/gno.16 +mv $RELDIR/Icons $RELDIR/System $RELDIR/dev $RELDIR/doc $RELDIR/etc $RELDIR/home $RELDIR/lang $RELDIR/sbin $RELDIR/var $RELDIR/gno.16 echo " " echo " "