fix miniroot command and dump new partition for /nbsd

[unix-history] / usr / src / sys / vax / dist / maketape

diff --git a/usr/src/sys/vax/dist/maketape b/usr/src/sys/vax/dist/maketape
index f8876f1..df341e0 100644 (file)
--- a/usr/src/sys/vax/dist/maketape
+++ b/usr/src/sys/vax/dist/maketape
@@ -4,7 +4,7 @@
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #

-#      @(#)maketape    4.21 (Berkeley) %G%
+#      @(#)maketape    4.26 (Berkeley) %G%

 #
 #      maketape [ 6250 | 1600 [ tapename [ remotetapemachine ] ] ]
 miniroot=hp0d
 #
 #      maketape [ 6250 | 1600 [ tapename [ remotetapemachine ] ] ]
 miniroot=hp0d


@@ -20,8 +20,8 @@ $remote mt -t ${tape} rew
 date
 umount /dev/hp2g
 umount /dev/hp2a
 date
 umount /dev/hp2g
 umount /dev/hp2a

-mount -r /dev/hp2a /nbsd
-mount -r /dev/hp2g /nbsd/usr
+mount -r /dev/hp2a /c/nbsd
+mount -r /dev/hp2g /c/nbsd/usr

 cd /nbsd/tp
 tp cmf /tmp/tape.$$ boot copy format
 cd /nbsd/sys/mdec
 cd /nbsd/tp
 tp cmf /tmp/tape.$$ boot copy format
 cd /nbsd/sys/mdec


@@ -31,21 +31,15 @@ cat tsboot htboot tmboot mtboot utboot noboot noboot /tmp/tape.$$ | \
 cd /nbsd
 sync
 echo "Add dump of mini-root file system"
 cd /nbsd
 sync
 echo "Add dump of mini-root file system"

-eval dd if=/dev/r${miniroot} count=205 bs=20b ${remote+"| $remote dd obs=20b"} \
-       of=${tape} conv=sync
+eval dd if=/dev/r${miniroot} count=205 bs=20b conv=sync ${remote+'|'} \
+       ${remote-"of=$tape"} ${remote+'/usr/local/20b ">" $tape'}

 echo "Add full dump of real file system"
 echo "Add full dump of real file system"

-/etc/${remote+r}dump 0uf $remote${remote+:}${tape} /nbsd
-echo "Add tar image of system sources"
-cd /nbsd/sys; eval tar cf ${tartape} . \
-       ${remote+'| $remote /usr/local/20b ">" $tape'}
+/etc/${remote+r}dump 0uf $remote${remote+:}${tape} /c/nbsd

 echo "Add tar image of /usr"
 cd /nbsd/usr; eval tar cf ${tartape} adm bin dict doc games \
        guest hosts include lib local man mdec msgs new \
        preserve pub spool tmp ucb \
                ${remote+'| $remote /usr/local/20b ">" $tape'}
 echo "Add tar image of /usr"
 cd /nbsd/usr; eval tar cf ${tartape} adm bin dict doc games \
        guest hosts include lib local man mdec msgs new \
        preserve pub spool tmp ucb \
                ${remote+'| $remote /usr/local/20b ">" $tape'}

-echo "Add varian fonts"
-cd /usr/lib/vfont; eval tar cf ${tartape} . \
-       ${remote+'| $remote /usr/local/20b ">" $tape'}

 if [ ${type} != '6250' ]
 then
        echo "Done, rewinding first tape"
 if [ ${type} != '6250' ]
 then
        echo "Done, rewinding first tape"


@@ -53,14 +47,31 @@ then
        echo "Mount second tape and hit return when ready"
        echo "(or type name of next tape drive)"
        read x
        echo "Mount second tape and hit return when ready"
        echo "(or type name of next tape drive)"
        read x

-       if [ $x != "" ]
+       if [ "$x" != "" ]

        then    tape=$x
        fi
 fi
        then    tape=$x
        fi
 fi

+echo "Add tar image of system sources"
+cd /nbsd/sys; eval tar cf ${tartape} . \
+       ${remote+'| $remote /usr/local/20b ">" $tape'}

 echo "Add user source code"
 cd /nbsd/usr/src; eval tar cf ${tartape} Makefile bin etc games \
        include lib local old ucb undoc usr.bin usr.lib \
        ${remote+'| $remote /usr/local/20b ">" $tape'}
 echo "Add user source code"
 cd /nbsd/usr/src; eval tar cf ${tartape} Makefile bin etc games \
        include lib local old ucb undoc usr.bin usr.lib \
        ${remote+'| $remote /usr/local/20b ">" $tape'}

+echo "Add varian fonts"
+cd /usr/lib/vfont; eval tar cf ${tartape} . \
+       ${remote+'| $remote /usr/local/20b ">" $tape'}
+if [ ${type} != '6250' ]
+then
+       echo "Done, rewinding second tape"
+       $remote mt -t ${tape} rew &
+       echo "Mount third tape and hit return when ready"
+       echo "(or type name of next tape drive)"
+       read x
+       if [ "$x" != "" ]
+       then    tape=$x
+       fi
+fi

 echo "Add user contributed software"
 cd /nbsd/usr/src/new; eval tar cf ${tartape} . \
        ${remote+'| $remote /usr/local/20b ">" $tape'}
 echo "Add user contributed software"
 cd /nbsd/usr/src/new; eval tar cf ${tartape} . \
        ${remote+'| $remote /usr/local/20b ">" $tape'}