From: Arun Thomas Date: Wed, 22 Jun 2011 09:15:00 +0000 (+0200) Subject: Remove obsolete mkdist script X-Git-Tag: v3.2.0~533 X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/man.rndc-confgen.html?a=commitdiff_plain;h=67c2d2fa54d714a0d48605486b718ee0c1f847f1;p=minix.git Remove obsolete mkdist script --- diff --git a/commands/Makefile b/commands/Makefile index fe04f9c85..cb8455397 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -17,7 +17,7 @@ SUBDIR= aal add_route adduser advent arp ash at autil awk \ intr ipcrm ipcs irdpd isoread join kill last leave \ less lex life loadkeys loadramdisk logger login look lp \ lpd ls lspci M m4 mail make MAKEDEV man \ - mdb mdocml mesg mined mkdep mkdir mkdist mkfifo mkfs.mfs mknod \ + mdb mdocml mesg mined mkdep mkdir mkfifo mkfs.mfs mknod \ mkproto modem mount mt netconf newroot nice acknm nohup \ nonamed od packman passwd paste patch pax \ ping postinstall poweroff pr prep printf printroot \ diff --git a/commands/mkdist/Makefile b/commands/mkdist/Makefile deleted file mode 100644 index b9f842c55..000000000 --- a/commands/mkdist/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPTS= mkdist.sh -MAN= - -.include diff --git a/commands/mkdist/mkdist.sh b/commands/mkdist/mkdist.sh deleted file mode 100644 index 8e0664bf5..000000000 --- a/commands/mkdist/mkdist.sh +++ /dev/null @@ -1,300 +0,0 @@ -#!/bin/sh -# -# mkdist 3.6 - Make a Minix distribution Author: Kees J. Bot -# 20 Dec 1994 - -system=`uname` - -usage() -{ - case $system in - Minix) echo "Usage: $0" >&2 - ;; - Minix-vmd) echo "Usage: $0 base-path root-device usr-device" >&2 - esac - exit 1 -} - -# No options. -while getopts '' opt; do usage; done -shift `expr $OPTIND - 1` - -case $system:$# in -Minix:0) - # Interactive. - case "$0" in - /tmp/*) - rm -f "$0" - ;; - *) # Move out of /usr. - cp -p "$0" /tmp/mkdist - exec /tmp/mkdist - esac - std=t - base=/ - export PATH=/bin:/usr/bin - ;; -Minix-vmd:3) - # Called by an external script from Minix-vmd to help make a distribution. - std= - base="$1" rootdev="$2" usrdev="$3" -esac - -usrlist=" -bin -bin/MAKEDEV -bin/arch -bin/badblocks -bin/chmod -bin/clone -bin/compress -bin/cp -bin/cpdir -bin/df -`test -f $base/usr/bin/mtools || echo bin/dosdir bin/dosread bin/doswrite` -`test -f $base/usr/bin/mtools && echo bin/mtools` -bin/edparams -bin/getty -bin/grep -bin/installboot -bin/isodir -bin/isoinfo -bin/isoread -bin/kill -bin/ln -bin/login -bin/ls -bin/mined -bin/mkdir -bin/mkfs -bin/mknod -bin/mv -bin/od -bin/part -bin/partition -bin/readall -bin/repartition -bin/rm -bin/rmdir -bin/sed -bin/setup -bin/shutdown -bin/sleep -bin/sort -bin/stty -bin/sysenv -bin/tar -bin/uname -bin/uncompress -bin/update -bin/vol -bin/zcat -etc -etc/rc -lib -lib/keymaps -`cd $base/usr && echo lib/keymaps/*` -lib/pwdauth -mdec -mdec/boot -mdec/bootblock -mdec/jumpboot -mdec/masterboot -tmp -" - -if [ "$std" ] -then - # Find the root device, and the real root device. - . /etc/fstab - realroot=`printroot -r` - if [ $realroot = $root ] - then - rootdir=/ - else - umount $root >/dev/null 2>&1 - mount $root /root || exit - rootdir=/root - fi - - echo -n " -The installation root and /usr can be put on either one diskette of at least -1.2 Mb, or on two diskettes of at least 720 kb. - -Do you want to use a single diskette of at least 1.2 Mb? [y] "; read single - - case $single in - ''|[yY]*|sure) - single=t - ;; - *) single= - esac - - echo -n "Which drive to use? [0] "; read drive - - case $drive in - '') drive=0 - ;; - [01]) ;; - *) echo "Please type '0' or '1'" >&2; exit 1 - esac - - if [ "$single" ] - then - echo -n "Insert the root+usr diskette in drive $drive and hit RETURN" - else - echo -n "Insert the root diskette in drive $drive and hit RETURN" - fi - read ret - - rootdev=/dev/fd$drive - v1=-1 -else - rootdir=$base - v1='-t 1' -fi - -umount $rootdev 2>/dev/null -if [ "$std" ] -then - umount ${rootdev}p1 2>/dev/null - umount ${rootdev}p2 2>/dev/null -else - umount $rootdir/minix 2>/dev/null - umount $rootdir/etc 2>/dev/null -fi -mkfs $v1 -i 272 $rootdev 480 || exit -mount $rootdev /mnt || exit -if [ "$std" ] -then - partition -mf $rootdev 0 81:960 81:240 81:240 >/dev/null || exit - repartition $rootdev >/dev/null || exit - mkfs $v1 ${rootdev}p1 || exit - mkfs $v1 ${rootdev}p2 || exit - mount ${rootdev}p1 $rootdir/minix || exit # Hide /minix and /etc - mount ${rootdev}p2 $rootdir/etc 2>/dev/null # (complains about /etc/mtab) -else - install -d /tmp/.minix || exit - install -d /tmp/.etc || exit # Hide /minix and /etc - mount -t lo /tmp/.minix $rootdir/minix || exit - mount -t lo /tmp/.etc $rootdir/etc || exit -fi -cpdir -vx $rootdir /mnt || exit -install -d -o 0 -g 0 -m 755 /mnt || exit -install -d -o 0 -g 0 -m 555 /mnt/root || exit -install -d -o 0 -g 0 -m 555 /mnt/mnt || exit -install -d -o 0 -g 0 -m 555 /mnt/usr || exit -if [ "$std" ] -then - umount ${rootdev}p2 2>/dev/null # Unhide /etc - umount ${rootdev}p1 || exit # Unhide /minix -else - umount $rootdir/etc || exit # Unhide /etc - umount $rootdir/minix || exit # Unhide /minix -fi -install -d -o 2 -g 0 -m 755 /mnt/minix || exit -install -d -o 2 -g 0 -m 755 /mnt/etc || exit -set `ls -t $rootdir/minix` # Install the latest kernel -install -c $rootdir/minix/$1 /mnt/minix/`echo $1 | sed 's/r[0-9]*$//` || exit -cpdir -v $base/usr/src/etc /mnt/etc || exit # Install a fresh /etc -chown -R 0:0 /mnt/etc # Patch up owner and mode -chmod 600 /mnt/etc/shadow - -# Change /etc/fstab. -echo >/mnt/etc/fstab "\ -# Poor man's File System Table. - -root=unknown -usr=unknown" - -# How to install? -echo >/mnt/etc/issue "\ - -Login as root and run 'setup' to install Minix." - -umount $rootdev || exit -test "$std" && umount $root 2>/dev/null -installboot -d $rootdev $base/usr/mdec/bootblock boot >/dev/null - -# Partition the root floppy whether necessary or not. (Two images can be -# concatenated, or a combined image can be split later.) -partition -mf $rootdev 0 81:960 0:0 81:1440 81:480 >/dev/null || exit - -if [ "$std" ] -then - if [ "$single" ] - then - repartition $rootdev >/dev/null - usrdev=${rootdev}p2 - else - echo -n "Insert the usr diskette in drive $drive and hit RETURN" - read ret - usrdev=$rootdev - fi -fi - -mkfs $v1 -i 96 $usrdev 720 || exit -mount $usrdev /mnt || exit -install -d -o 0 -g 0 -m 755 /mnt || exit -(cd $base/usr && exec tar cfD - $usrlist) | (cd /mnt && exec tar xvfp -) || exit -umount $usrdev || exit - -# Put a "boot the other drive" bootblock on the /usr floppy. -installboot -m $usrdev /usr/mdec/masterboot >/dev/null - -# We're done for Minix-vmd here, it has its own ideas on how to package /usr. -test "$std" || exit 0 - -# Guess the size of /usr in compressed form. Assume compression down to 60% -# of the original size. Use "disk megabytes" of 1000*1024 for a safe guess. -set -$- `df | grep "^$usr"` -size=`expr \\( $4 \\* 6 / 10 + 999 \\) / 1000` - -echo -n " -You now need enough diskettes to hold /usr in compressed form, close to -$size Mb total. " - -size= -while [ -z "$size" ] -do - if [ "$single" ]; then defsize=1440; else defsize=720; fi - - echo -n "What is the size of the diskettes? [$defsize] "; read size - - case $size in - '') size=$defsize - ;; - 360|720|1200|1440) - ;; - *) echo "Sorry, I don't believe \"$size\", try again." >&2 - size= - esac -done - -drive= -while [ -z "$drive" ] -do - echo -n "What floppy drive to use? [0] "; read drive - - case $drive in - '') drive=0 - ;; - [01]) - ;; - *) echo "It must be 0 or 1, not \"$drive\"." - drive= - esac -done - -echo " -Enter the floppies in drive $drive when asked to. Mark them with the volume -numbers! -" -sleep 2 - -if [ `arch` = i86 ]; then bits=13; else bits=16; fi - ->/tmp/DONE -cd /usr && tar cvf - . /tmp/DONE \ - | compress -b$bits | vol -w $size /dev/fd$drive && -echo Done. diff --git a/man/man8/Makefile b/man/man8/Makefile index 7248e0714..27a722da6 100644 --- a/man/man8/Makefile +++ b/man/man8/Makefile @@ -3,7 +3,7 @@ MAN= add_route.8 adduser.8 backup.8 badblocks.8 boot.8 \ dhcpd.8 diskctl.8 dosminix.8 elvprsv.8 fdisk.8 fingerd.8 ftpd.8 \ getty.8 halt.8 hgfs.8 httpd.8 ifconfig.8 inet.8 init.8 \ installboot.8 intr.8 irdpd.8 loadramdisk.8 MAKEDEV.8 \ - mkdist.8 mknod.8 monitor.8 netconf.8 newroot.8 nonamed.8 \ + mknod.8 monitor.8 netconf.8 newroot.8 nonamed.8 \ ossdevlinks.8 part.8 partition.8 \ poweroff.8 printroot.8 pr_routes.8 pwdauth.8 rarpd.8 \ rdate.8 readclock.8 reboot.8 repartition.8 rlogind.8 \ diff --git a/man/man8/mkdist.8 b/man/man8/mkdist.8 deleted file mode 100644 index 4e502b711..000000000 --- a/man/man8/mkdist.8 +++ /dev/null @@ -1,30 +0,0 @@ -.TH MKDIST 8 -.SH NAME -mkdist \- make a MINIX 3 distribution -.SH SYNOPSIS -.B mkdist -.SH DESCRIPTION -.B Mkdist -makes a MINIX 3 distribution on floppies. Run the command as -.B root -and follow the instructions. It will make one or two bootable installation -floppies and a compressed tar file of -.B /usr -on several floppies using -.BR vol (1). -.PP -The result can be installed on another system as described in -.BR usage (8), -except that all of -.B /usr -is saved on one set of floppies instead of being nicely split in binary -and source packages. -.SH "SEE ALSO" -.BR tar (1), -.BR compress (1), -.BR vol (1), -.BR usage (8). -.SH NOTES -Also very useful for making backups. -.SH AUTHOR -Kees J. Bot (kjb@cs.vu.nl) diff --git a/man/man8/usage.8 b/man/man8/usage.8 index 75067d8e1..d53498a31 100644 --- a/man/man8/usage.8 +++ b/man/man8/usage.8 @@ -908,7 +908,6 @@ the default setup for a new user is found. .BR dev (4), .BR adduser (8), .BR TZ (5), -.BR mkdist (8), .BR shutdown (8). .br "Operating Systems \- Design and Implementation 2/e" by Andrew S. Tanenbaum