release.sh: simplify by removing usb option

	. relies on bios_wini which is long gone

Change-Id: I95257b6204cc6d928abcbd8492808b4b6450a99e

diff --git a/etc/system.conf b/etc/system.conf
index 48796b607ef012b0faf832b97d12209c27a96847..dc81ce5ce92eb889af59121e63a0930c1fdf3996 100644 (file)
--- a/etc/system.conf
+++ b/etc/system.conf
@@ -524,11 +524,9 @@ service filter
        ipc
                SYSTEM pm vfs rs ds vm
                at_wini
-               bios_wini
        ;
        control
                at_wini
-               bios_wini
        ;
 };
 
@@ -684,6 +682,5 @@ service fbd
                SYSTEM VFS RS DS VM
                ahci
                at_wini
-               bios_wini
        ;
 };

diff --git a/man/man8/config.8 b/man/man8/config.8
index bec77ddbec1c6d5fb9d9254f944d06437add046f..87948107c97968c96c69abea83dcde7d5ec81740 100644 (file)
--- a/man/man8/config.8
+++ b/man/man8/config.8
@@ -240,27 +240,6 @@ programs do with mail boxes.  A "no locks available" error indicates that
 this table has run out.
 .PP
 .ti 2m
-.B kernel/bios_wini.c
-.ti 2m
-.B kernel/dosfile.c
-.ti 2m
-.B kernel/fatfile.c
-.br
-The number of disks each of these drivers can handle is specified by:
-.TP
-.B MAX_DRIVES
-This parameter is set to
-.B 4
-for the BIOS and "DOS file" drivers, and to
-.B 2
-for the "FAT file" driver.  It can be set as high as you need to allow for
-more disks, or files as disks.  (The "FAT" driver needs quite some memory per
-disk, which is why it by default only allows 2 disks.)  You will need to run
-.BR MAKEDEV (8)
-to create the extra disk devices in
-.BR /dev/ .
-.PP
-.ti 2m
 .B inet/inet_config.h
 .br
 The maximum number of TCP/IP networks is:

diff --git a/releasetools/release.functions b/releasetools/release.functions
index 49b5d0299dcfff7d0c759d8b4f741d0fd6830e61..7c56407ef68945ff92c8cd1bc861d2ddd1f4a4c7 100644 (file)
--- a/releasetools/release.functions
+++ b/releasetools/release.functions
@@ -100,21 +100,6 @@ load=/mod12_init
 END_BOOT_CFG
 }
 
-usb_root_changes()
-{
-       $RELEASEDIR/usr/sbin/installboot_nbsd $TMPDISKROOT \
-               $RELEASEDIR/usr/mdec/bootxx_minixfs3
-       echo \
-cat >$RELEASEMNTDIR/boot.cfg <<END_BOOT_CFG
-menu=Regular MINIX 3:load_mods /boot/minix_default/mod*;multiboot /boot/minix_default/kernel bios_wini=yes bios_remap_first=1 rootdevname=c0d7p0s0
-menu=Edit menu option:edit
-menu=Drop to boot prompt:prompt
-clear=1
-timeout=10
-default=1
-END_BOOT_CFG
-}
-
 copy_local_packages()
 {
        if [ -d $PACKAGEDIR -a -f $PACKAGELIST -a $PACKAGES -ne 0 ]

diff --git a/releasetools/release.sh b/releasetools/release.sh
index a3d3fe9797afcdf329f7101397ce11640c161171..b271178478b29708ae27f391518e86e0d031e044 100755 (executable)
--- a/releasetools/release.sh
+++ b/releasetools/release.sh
@@ -75,11 +75,11 @@ fi
 
 FILENAMEOUT=""
 
-while getopts "b:j:ls:pmMchu?f:L:e:" c
+while getopts "b:j:ls:pmMch?f:L:e:" c
 do
        case "$c" in
        \?)
-               echo "Usage: $0 [-l] [-p] [-c] [-m] [-M] [-u] [-f <filename>] [-s <username>] -j<jaildir> [-L <packageurl>] [-e <extras-path>]" >&2
+               echo "Usage: $0 [-l] [-p] [-c] [-m] [-M] [-f <filename>] [-s <username>] -j<jaildir> [-L <packageurl>] [-e <extras-path>]" >&2
                exit 1
        ;;
        b)
@@ -96,11 +96,6 @@ do
                RELEASEDIR=$OPTARG
                JAILMODE=1
                ;;
-       u)
-               echo " * Making live USB-stick image"
-               IMG_BASE=minix${version}_usb
-               USB=1
-               ;;
        f)
                FILENAMEOUT="$OPTARG"
                ;;
@@ -193,11 +188,7 @@ then
 #endif" >>$CONFIGHEADER
        DATE=`date +%Y%m%d`
        # output image name
-       if [ "$USB" -ne 0 ]; then
-               IMG=${IMG_BASE}_${DATE}_${REVTAG}.img
-       else
-               IMG=${IMG_BASE}_${DATE}_${REVTAG}.iso
-       fi
+       IMG=${IMG_BASE}_${DATE}_${REVTAG}.iso
 else
        echo "First cleaning current sourcedir.."
        ( cd .. && make cleandir >/dev/null )
@@ -211,9 +202,7 @@ else
 fi
 
 # Make sure the CD knows it's a CD, unless it's not
-if [ "$USB" -eq 0 ]
-then   date >$RELEASEDIR/CD
-fi
+date >$RELEASEDIR/CD
 
 rm -f $RELEASEDIR/usr/$SRC/releasetools/revision
 
@@ -293,17 +282,6 @@ extrakb=`du -ks $RELEASEDIR/usr/install | awk '{ print $1 }'`
 find $RELEASEDIR/usr | fgrep -v /install/ | wc -l >$RELEASEDIR/.usrfiles
 find $RELEASEDIR -print -path $RELEASEDIR/usr -prune | wc -l >$RELEASEDIR/.rootfiles
 
-fstab_marker="# Poor man's File System Table."
-echo " * Writing fstab"
-if [ "$USB" -ne 0 ]
-then
-       echo \
-"$fstab_marker
-root=/dev/c0d7p0s0
-usr=/dev/c0d7p0s2
-" > $RELEASEDIR/etc/fstab
-fi
-
 ##########################################################################
 echo " * Mounting $TMPDISKROOT as $RELEASEMNTDIR"
 ##########################################################################
@@ -329,10 +307,7 @@ echo " * Unmounting $TMPDISKUSR from $RELEASEMNTDIR/usr"
 umount $TMPDISKUSR || exit
 
 echo " * Making image bootable"
-if [ "$USB" -ne 0 ]
-then   usb_root_changes
-else   cd_root_changes
-fi
+cd_root_changes
 
 echo " * Unmounting $TMPDISKROOT from $RELEASEMNTDIR"
 umount $TMPDISKROOT || exit
@@ -348,31 +323,27 @@ echo "This is Minix version $version_pretty prepared `date`." >$CDFILES/VERSION.
 boottype=-n
 bootimage=$IMAGE
 
-if [ "$USB" -ne 0 ]; then
-       mv $bootimage $IMG
-else
-       cp $RELEASEDIR/usr/mdec/boot_monitor $CDFILES/boot
-       cp -rf $RELEASEDIR/boot/minix_latest/* $CDFILES/
-       gzip -d $CDFILES/*gz
-       writeisofs -s0x0 -l MINIX -B $bootimage $boottype $CDFILES $IMG || exit 1
-
-       echo "Appending Minix root and usr filesystem"
-       # Pad ISO out to cylinder boundary
-       isobytes=`stat -f %z $IMG`
-       isosects=`expr $isobytes / 512`
-       isopad=`expr $secs - '(' $isosects % $secs ')'`
-       dd if=/dev/zero count=$isopad >>$IMG
-       # number of sectors
-       isosects=`expr $isosects + $isopad`
-       ( cat $IMG $ROOTIMAGE ;
-               dd if=$TMPDISKUSR bs=$BS count=$USRBLOCKS ) >m
-       mv m $IMG
-       # Make CD partition table
-       installboot_nbsd -m $IMG /usr/mdec/mbr
-       # Make sure there is no hole..! Otherwise the ISO format is
-       # unreadable.
-       partition -m $IMG 0 81:$isosects 81:$ROOTSECTS 81:$USRSECTS
-fi
+cp $RELEASEDIR/usr/mdec/boot_monitor $CDFILES/boot
+cp -rf $RELEASEDIR/boot/minix_latest/* $CDFILES/
+gzip -d $CDFILES/*gz
+writeisofs -s0x0 -l MINIX -B $bootimage $boottype $CDFILES $IMG || exit 1
+
+echo "Appending Minix root and usr filesystem"
+# Pad ISO out to cylinder boundary
+isobytes=`stat -f %z $IMG`
+isosects=`expr $isobytes / 512`
+isopad=`expr $secs - '(' $isosects % $secs ')'`
+dd if=/dev/zero count=$isopad >>$IMG
+# number of sectors
+isosects=`expr $isosects + $isopad`
+( cat $IMG $ROOTIMAGE ;
+       dd if=$TMPDISKUSR bs=$BS count=$USRBLOCKS ) >m
+mv m $IMG
+# Make CD partition table
+installboot_nbsd -m $IMG /usr/mdec/mbr
+# Make sure there is no hole..! Otherwise the ISO format is
+# unreadable.
+partition -m $IMG 0 81:$isosects 81:$ROOTSECTS 81:$USRSECTS
 
 # Clean up: RELEASEDIR no longer needed
 rm -r $RELEASEDIR