More changes, while working on Amiga generic miniroot stuff:
- added method BOOTINSTALL, for an architecture to optionally install a bootblock in the miniroot (this works for Amiga) - added Amiga keymap directories - removed the subdir selection from mount_local_disk() and mount_nfs(), and the remains from mount_cdrom(), as all are handled now by the subdir navigator in mount_from_installed_fs()
This commit is contained in:
is
parent
ca07d14b0f
commit
cd718ac0c1
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.14 1997/07/15 08:16:36 pk Exp $
|
||||
# $NetBSD: Makefile,v 1.15 1997/09/09 23:02:04 is Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -18,6 +18,7 @@ VND_RDEV= /dev/r${VND}
|
|||
IMAGE?= miniroot-${REV}.fs
|
||||
IMAGESIZE?= 12288 # 6Mb in 512 byte blocks
|
||||
NEWFSOPTS?=
|
||||
BOOTINSTALL?= true
|
||||
|
||||
.ifdef DISKTYPE
|
||||
DISKTYPEARG= -t ${DISKTYPE}
|
||||
|
|
@ -36,11 +37,13 @@ all:
|
|||
all: ${CBIN}
|
||||
dd if=/dev/zero of=${IMAGE} count=${IMAGESIZE}
|
||||
vnconfig ${DISKTYPEARG} -v -c ${VND_DEV} ${IMAGE}
|
||||
newfs -m 0 -o space ${NEWFSOPTS} ${VND_RDEV} ${DISKTYPE}
|
||||
-newfs -m 0 -o space ${NEWFSOPTS} ${VND_RDEV} ${DISKTYPE}
|
||||
${BOOTINSTALL}
|
||||
mount ${VND_DEV} ${MOUNT_POINT}
|
||||
mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
|
||||
REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} ARCHDIR=${ARCHDIR} \
|
||||
TARGDIR=${MOUNT_POINT} sh ${.CURDIR}/runlist.sh ${LISTS}
|
||||
TARGDIR=${MOUNT_POINT} VND_RDEV=${VND_RDEV} \
|
||||
sh ${.CURDIR}/runlist.sh ${LISTS}
|
||||
@echo ""
|
||||
@df -i ${MOUNT_POINT}
|
||||
@echo ""
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/sh
|
||||
# $NetBSD: install.sub,v 1.19 1997/09/08 23:22:44 pk Exp $
|
||||
# $NetBSD: install.sub,v 1.20 1997/09/09 23:02:05 is Exp $
|
||||
#
|
||||
# Copyright (c) 1996 The NetBSD Foundation, Inc.
|
||||
# All rights reserved.
|
||||
|
|
@ -681,6 +681,19 @@ install_from_mounted_fs() {
|
|||
|
||||
_dirname=$1
|
||||
_sets=""
|
||||
|
||||
echo ""
|
||||
echo "The directory at the mount point, \"${_dirname}\", contains: "
|
||||
echo ""
|
||||
ls -F ${_dirname}
|
||||
echo ""
|
||||
echo "Enter the subdirectory relative to the mountpoint, that"
|
||||
echo -n "contains the savesets: [try this directory] "
|
||||
getresp ""
|
||||
if [ "X${resp}" != "X" ]; then
|
||||
_dirname=${_dirname}/$resp
|
||||
fi
|
||||
|
||||
while ! dir_has_sets ${_dirname} $THESETS; do
|
||||
echo ""
|
||||
echo -n "There are no NetBSD install sets available in "
|
||||
|
|
@ -847,25 +860,7 @@ __install_cdrom_2
|
|||
return
|
||||
fi
|
||||
|
||||
# Get the directory where the file lives
|
||||
_directory="."
|
||||
resp = "." # force one iteration
|
||||
while [ "X${resp}" != X"" ]; do
|
||||
echo ""
|
||||
echo "The current directory, ${_directory}, contains:"
|
||||
echo ""
|
||||
(cd /mnt2/$_directory; ls -F)
|
||||
cat << \__install_cdrom_3
|
||||
|
||||
Enter the directory relative to this point that contains the files, or
|
||||
nothing to install from here.
|
||||
|
||||
__install_cdrom_3
|
||||
getresp ""
|
||||
_directory=${_directory}/$resp
|
||||
done
|
||||
|
||||
install_from_mounted_fs /mnt2/${_directory}
|
||||
install_from_mounted_fs /mnt2
|
||||
umount -f /mnt2 > /dev/null 2>&1
|
||||
}
|
||||
|
||||
|
|
@ -980,16 +975,7 @@ __install_disk_1
|
|||
return
|
||||
fi
|
||||
|
||||
# Get the directory where the file lives
|
||||
resp="" # force one iteration
|
||||
while [ "X${resp}" = X"" ]; do
|
||||
echo "Enter the directory relative to the mount point that"
|
||||
echo -n "contains the file. [${_directory}] "
|
||||
getresp "${_directory}"
|
||||
done
|
||||
_directory=$resp
|
||||
|
||||
install_from_mounted_fs /mnt2/${_directory}
|
||||
install_from_mounted_fs /mnt2
|
||||
umount -f /mnt2 > /dev/null 2>&1
|
||||
}
|
||||
|
||||
|
|
@ -1031,16 +1017,7 @@ install_nfs() {
|
|||
return
|
||||
fi
|
||||
|
||||
# Get the directory where the file lives
|
||||
resp="" # force one iteration
|
||||
while [ "X${resp}" = X"" ]; do
|
||||
echo "Enter the directory relative to the mount point that"
|
||||
echo -n "contains the file. [${_nfs_directory}] "
|
||||
getresp "${_nfs_directory}"
|
||||
done
|
||||
_nfs_directory=$resp
|
||||
|
||||
install_from_mounted_fs /mnt2/${_nfs_directory}
|
||||
install_from_mounted_fs /mnt2
|
||||
umount -f /mnt2 > /dev/null 2>&1
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: mtree.conf,v 1.3 1996/07/15 06:28:28 leo Exp $
|
||||
# $NetBSD: mtree.conf,v 1.4 1997/09/09 23:02:06 is Exp $
|
||||
|
||||
/set type=dir uname=root gname=wheel mode=0755
|
||||
# .
|
||||
|
|
@ -74,6 +74,11 @@ zoneinfo
|
|||
keymaps
|
||||
# ./usr/share/keymaps
|
||||
|
||||
# ./usr/share/keymaps/amiga
|
||||
amiga
|
||||
# ./usr/share/keymaps/amiga
|
||||
..
|
||||
|
||||
# ./usr/share/keymaps/atari
|
||||
atari
|
||||
# ./usr/share/keymaps/atari
|
||||
|
|
|
|||
Loading…
Reference in New Issue