diff options
-rw-r--r-- | release/Makefile | 25 | ||||
-rw-r--r-- | release/boot_flp.conf | 4 | ||||
-rw-r--r-- | release/cpio_flp_1.conf | 2 | ||||
-rw-r--r-- | release/extract.sh | 10 |
4 files changed, 24 insertions, 17 deletions
diff --git a/release/Makefile b/release/Makefile index ea56ea7..16693b1 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.54 1994/11/20 22:56:27 phk Exp $ +# $Id: Makefile,v 1.55 1994/11/20 23:31:36 wollman Exp $ # # Evil floppies are, of course, 1.2MB floppies. @@ -17,13 +17,13 @@ DDCOUNT= 80 MNT= /mnt -CPIO1= basename cat chmod cksum cp date dd df dmesg echo ed expr hostname kill -CPIO1+= ln ls mkdir mt mv rcp rm rmdir sh sleep stty sync tar test tip [ -sh -CPIO1+= badsect chown clri disklabel dump dmesg fdisk fsck getopt ifconfig init -CPIO1+= mknod mount mount_cd9660 mount_msdos mount_nfs ncftp newfs ping pwd +CPIO1= basename cat chmod cksum cp cu date dd df dmesg echo ed expr hostname +CPIO1+= kill ln ls mkdir mt mv rcp rm rmdir sh sleep stty sync tar test tip [ +CPIO1+= -sh badsect chown clri disklabel dump dmesg fdisk fsck getopt ifconfig +CPIO1+= init mknod mount mount_cd9660 mount_msdos mount_nfs ncftp newfs ping pwd CPIO1+= reboot restore slattach swapon umount route CPIO1+= rdump rrestore halt ft -CPIO1+= ftp rsh sed telnet tzsetup rlogin grep +CPIO1+= ftp rsh sed telnet rlogin grep CPIO2= etc/services etc/protocols @@ -31,6 +31,8 @@ CPIO2= etc/services etc/protocols # a successful extraction. CPIO3= miscfuncs.sh instdist.sh netinst.sh adduser.sh bininst +CPIO4= /usr/sbin/tzsetup + # Somewhat on the rough side... CLEANFILES+= *.o *.c *.cache *.mk *.lo ${CPIO1} *.flp *.gz CLEANFILES+= boot_flp boot.flp cpio_flp_1 @@ -78,6 +80,7 @@ boot.flp: chmod 755 ${MNT}/stand/sysinstall ln ${MNT}/stand/sysinstall ${MNT}/stand/newfs ln ${MNT}/stand/sysinstall ${MNT}/stand/gzip + ln ${MNT}/stand/sysinstall ${MNT}/stand/fsck install -m 400 -c ${.CURDIR}/../COPYRIGHT ${MNT}/COPYRIGHT install -m 400 -c ${.CURDIR}/../share/FAQ/README-2.0 ${MNT}/README install -m 400 -c ${.CURDIR}/../share/FAQ/TROUBLESHOOTING \ @@ -94,10 +97,14 @@ boot.flp: df -k /dev/r${FLOPPY} cpio.flp: + crunchgen ${.CURDIR}/cpio_flp_1.conf + ${MAKE} -f cpio_flp_1.mk objs exe for i in ${CPIO1} ; do rm -f ./$$i ; ln cpio_flp_1 ./$$i ; done ( cd /${DESTDIR} ; ls ${CPIO2} | cpio -H newc -oa ) | cpio -ivd ( cd ${.CURDIR} ; ls ${CPIO3} | cpio -H newc -oa ) | cpio -ivd - ls ${CPIO1} ${CPIO2} ${CPIO3} | cpio -H newc -oa | gzip -9 | \ + cp ${CPIO4} . + ls ${CPIO1} ${CPIO2} ${CPIO3} ${CPIO4} | \ + cpio -H newc -oa | gzip -9 | \ dd conv=osync > cpio.flp gzip -9 -v < cpio.flp > cpio.flp.gz ls -l cpio.flp* @@ -131,7 +138,7 @@ release20: NOCRYPT=yes SHARED=copies) ( cd ${RELEASEDIR}/filesys; \ tar cf - . | \ - ${ZIPNSPLIT} ${RELEASEDIR}/tarballs/bindist/bin_tgz.) + ${ZIPNSPLIT} ${RELEASEDIR}/tarballs/bindist/bindist.) cp ${.CURDIR}/extract.sh ${RELEASEDIR}/tarballs/bindist ( cd ${RELEASEDIR}/tarballs/bindist; ${.CURDIR}/mkchecksums.sh ) ( cd ${.CURDIR} ; \ @@ -192,7 +199,7 @@ tarballs: mkdir ${RELEASEDIR}/tarballs/$${i} ; \ ( cd ${RELEASEDIR}/$${i}; \ tar cf - . | \ - ${ZIPNSPLIT} ${RELEASEDIR}/tarballs/$$i/$${i}_tgz.) ; \ + ${ZIPNSPLIT} ${RELEASEDIR}/tarballs/$$i/$${i}.) ; \ ( cd ${RELEASEDIR}/tarballs/$${i}; sh -e ${.CURDIR}/mkchecksums.sh ) ; \ cp ${.CURDIR}/extract.sh cd ${RELEASEDIR}/tarballs/$${i} ;\ done diff --git a/release/boot_flp.conf b/release/boot_flp.conf index e67c5f3..23433ac 100644 --- a/release/boot_flp.conf +++ b/release/boot_flp.conf @@ -1,4 +1,4 @@ -# $Id: boot_flp.conf,v 1.2 1994/11/15 08:10:32 jkh Exp $ +# $Id: boot_flp.conf,v 1.3 1994/11/18 11:31:28 phk Exp $ srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/gnu/usr.bin srcdirs /usr/src/usr.sbin @@ -7,7 +7,7 @@ srcdirs /usr/src/usr.sbin # progs sh mkdir rm mknod chmod expr # progs ln test mount umount cat mv sync cp # progs cpio gzip sysinstall newfs -progs sysinstall newfs gzip cpio fsck dialog bad144 +progs sysinstall newfs gzip cpio fsck dialog bad144 fsck ln gzip gunzip ln gzip zcat # ln sh -sh diff --git a/release/cpio_flp_1.conf b/release/cpio_flp_1.conf index 282a0b9..3d8cffc 100644 --- a/release/cpio_flp_1.conf +++ b/release/cpio_flp_1.conf @@ -21,7 +21,7 @@ ln sh -sh # init invokes the shell this way progs badsect basename chown clri disklabel dmesg dump dmesg fdisk fsck ft progs getopt ifconfig init mknod mount mount_cd9660 mount_msdos mount_nfs -progs newfs ping reboot restore route swapon tzsetup umount +progs newfs ping reboot restore route swapon umount ln dump rdump ln restore rrestore ln reboot halt diff --git a/release/extract.sh b/release/extract.sh index 8c0c313..bffca5a 100644 --- a/release/extract.sh +++ b/release/extract.sh @@ -1,9 +1,9 @@ #!/bin/sh -# $Id: extract.sh,v 1.13 1994/11/18 10:22:39 jkh Exp $ +# $Id: extract.sh,v 1.14 1994/11/20 22:55:24 phk Exp $ PATH=/stand:$PATH DDIR=/ -if [ -f bindist_tgz.aa ] ; then +if [ -f bindist.aa ] ; then # Temporary kludge for pathological bindist. if [ -f $DDIR/etc/myname ]; then cp $DDIR/etc/hosts $DDIR/etc/myname $DDIR/stand/etc @@ -12,7 +12,7 @@ if [ -f bindist_tgz.aa ] ; then cp $DDIR/etc/defaultrouter $DDIR/stand/etc fi echo; echo "Extracting bindist, please wait." - cat bin_tgz.?? | gzip -c -d | ( cd $DDIR; cpio -H tar -imdu ) + cat bindist.?? | gzip -c -d | ( cd $DDIR; cpio -H tar -imdu ) if [ -f $DDIR/stand/etc/myname ]; then # Add back what the bindist nuked. cp $DDIR/stand/etc/myname $DDIR/etc @@ -27,10 +27,10 @@ for i in *.aa do b=`basename $i .aa` if [ "$b" != bin_tgz ] ; then - if [ "$b" = des_tgz ] ; then + if [ "$b" = des ] ; then # We cannot replace /sbin/init while it runs # so move it out of the way for now - mv /sbin/init /sbin/nondes_init + mv /sbin/init /sbin/non_des_init fi echo "Extracting $b" cat $b.?? | gzip -c -d | ( cd $DDIR; cpio -H tar -imdu ) |