summaryrefslogtreecommitdiff
path: root/distrib/i386
diff options
context:
space:
mode:
Diffstat (limited to 'distrib/i386')
-rw-r--r--distrib/i386/floppies/common/dot.profile5
-rw-r--r--distrib/i386/floppies/common/install.md23
-rw-r--r--distrib/i386/floppies/common/instbin-nokrb.conf4
-rw-r--r--distrib/i386/floppies/common/instbin.conf8
-rw-r--r--distrib/i386/floppies/common/list7
-rw-r--r--distrib/i386/floppies/common/mtree.conf7
-rw-r--r--distrib/i386/floppies/ramdiskC/instbin.conf4
-rw-r--r--distrib/i386/floppies/ramdiskC/list3
8 files changed, 19 insertions, 42 deletions
diff --git a/distrib/i386/floppies/common/dot.profile b/distrib/i386/floppies/common/dot.profile
index 7a401329398..b4254352168 100644
--- a/distrib/i386/floppies/common/dot.profile
+++ b/distrib/i386/floppies/common/dot.profile
@@ -1,4 +1,4 @@
-# $OpenBSD: dot.profile,v 1.3 2000/10/25 16:38:12 millert Exp $
+# $OpenBSD: dot.profile,v 1.4 2001/06/23 19:44:41 deraadt Exp $
# $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $
#
# Copyright (c) 1995 Jason R. Thorpe
@@ -37,7 +37,6 @@ export HISTFILE=/.sh_history
umask 022
set -o emacs # emacs-style command line editing
-alias dmesg="cat /kern/msgbuf"
# XXX
# the TERM/EDITOR stuff is really well enough parameterized to be moved
@@ -51,8 +50,6 @@ EDITUBIN=/usr/bin
if [ "X${DONEPROFILE}" = "X" ]; then
DONEPROFILE=YES
- # mount kernfs and re-mount the boot media (perhaps r/w)
- mount_kernfs /kern /kern
mount_ffs -o update /dev/rd0a /
# set up some sane defaults
diff --git a/distrib/i386/floppies/common/install.md b/distrib/i386/floppies/common/install.md
index c8eec944b88..39395b114b9 100644
--- a/distrib/i386/floppies/common/install.md
+++ b/distrib/i386/floppies/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.12 2001/03/13 21:22:50 deraadt Exp $
+# $OpenBSD: install.md,v 1.13 2001/06/23 19:44:42 deraadt Exp $
#
#
# Copyright rc) 1996 The NetBSD Foundation, Inc.
@@ -42,6 +42,7 @@
# Machine-dependent install sets
MDSETS=kernel
+ARCH=ARCH
md_set_term() {
test -n "$TERM" && return
@@ -51,22 +52,14 @@ md_set_term() {
export TERM
}
-md_makerootwritable() {
- :
-}
-
-md_machine_arch() {
- cat /kern/machine
-}
-
md_get_diskdevs() {
# return available disk devices
- bsort `egrep -a "^[sw]d[0-9]+ " /kern/msgbuf | cutword 1`
+ bsort `dmesg | egrep -a "^[sw]d[0-9]+ " | cutword 1`
}
md_get_cddevs() {
# return available CDROM devices
- bsort `egrep -a "^cd[0-9]+ " /kern/msgbuf | cutword 1`
+ bsort `dmesg | egrep -a "^cd[0-9]+ " | cutword 1`
}
md_get_partition_range() {
@@ -280,11 +273,3 @@ halted, reset the machine and boot from the disk.
__EOT
}
-
-hostname() {
- case $# in
- 0) cat /kern/hostname ;;
- 1) echo "$1" > /kern/hostname ;;
- *) echo usage: hostname [name-of-host]
- esac
-}
diff --git a/distrib/i386/floppies/common/instbin-nokrb.conf b/distrib/i386/floppies/common/instbin-nokrb.conf
index a37e0dcaca8..458f30012f2 100644
--- a/distrib/i386/floppies/common/instbin-nokrb.conf
+++ b/distrib/i386/floppies/common/instbin-nokrb.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: instbin-nokrb.conf,v 1.6 2000/07/07 21:52:14 marc Exp $
+# $OpenBSD: instbin-nokrb.conf,v 1.7 2001/06/23 19:44:42 deraadt Exp $
#
# instbin-nokrb.conf - unified binary for the inst/upgr floppies
#
@@ -9,7 +9,7 @@ srcdirs usr.sbin/pppd sys/arch/i386/stand
progs cat chmod cp dd df disklabel dhclient ed
progs fsck_ffs ftp fdisk
progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
-progs mount_ffs mount_msdos mount_kernfs mount_ext2fs
+progs mount_ffs mount_msdos mount_ext2fs
progs mv newfs pax ksh ping reboot rm route
progs sed sleep stty umount
progs rsh restore gzip grep installboot
diff --git a/distrib/i386/floppies/common/instbin.conf b/distrib/i386/floppies/common/instbin.conf
index a790a4c995c..731acc18192 100644
--- a/distrib/i386/floppies/common/instbin.conf
+++ b/distrib/i386/floppies/common/instbin.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: instbin.conf,v 1.15 2001/04/09 06:55:40 deraadt Exp $
+# $OpenBSD: instbin.conf,v 1.16 2001/06/23 19:44:42 deraadt Exp $
#
# instbin.conf - unified binary for the inst/upgr floppies
#
@@ -6,10 +6,10 @@
srcdirs distrib/special bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
srcdirs usr.sbin/pppd sys/arch/i386/stand
-progs cat chmod cp dd df disklabel dhclient ed
-progs fsck_ffs ftp fdisk
+progs cat chmod cp dd df disklabel dhclient dmesg ed
+progs fsck_ffs ftp fdisk hostname
progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
-progs mount_ffs mount_msdos mount_kernfs mount_ext2fs
+progs mount_ffs mount_msdos mount_ext2fs
progs mv newfs pax ksh ping reboot rm route
progs sed sleep stty umount
progs rsh restore gzip grep installboot
diff --git a/distrib/i386/floppies/common/list b/distrib/i386/floppies/common/list
index 91ff7753fbe..3b4a3eae66c 100644
--- a/distrib/i386/floppies/common/list
+++ b/distrib/i386/floppies/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.19 2001/04/19 02:17:32 deraadt Exp $
+# $OpenBSD: list,v 1.20 2001/06/23 19:44:42 deraadt Exp $
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/instbin instbin
@@ -15,6 +15,7 @@ LINK instbin bin/ls
LINK instbin bin/mkdir
LINK instbin bin/mv
LINK instbin bin/rm
+LINK instbin bin/hostname
LINK instbin bin/sh bin/ksh
LINK instbin bin/sleep
LINK instbin bin/stty
@@ -22,6 +23,7 @@ LINK instbin sbin/chown
LINK instbin sbin/disklabel
LINK instbin sbin/dhclient
LINK instbin sbin/fdisk
+LINK instbin sbin/dmesg
LINK instbin sbin/fsck sbin/fsck_ffs
LINK instbin sbin/halt sbin/reboot
LINK instbin sbin/ifconfig
@@ -31,7 +33,6 @@ LINK instbin sbin/mount
LINK instbin sbin/mount_cd9660
LINK instbin sbin/mount_ffs
LINK instbin sbin/mount_msdos
-LINK instbin sbin/mount_kernfs
LINK instbin sbin/mount_ext2fs
LINK instbin sbin/ping
LINK instbin sbin/newfs
@@ -82,7 +83,7 @@ COPY ${CURDIR}/../common/termcap.vt usr/share/misc/termcap
# and the installation tools
SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../common/dot.profile > .profile
-SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../common/install.md > install.md
+SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../common/install.md > install.md
SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../../miniroot/upgrade.sh > upgrade
SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../../miniroot/install.sh > install
SPECIAL sed -e '/^#[ ].*$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../../miniroot/install.sub > install.sub
diff --git a/distrib/i386/floppies/common/mtree.conf b/distrib/i386/floppies/common/mtree.conf
index 4cf67a9de1c..9a87ca621a9 100644
--- a/distrib/i386/floppies/common/mtree.conf
+++ b/distrib/i386/floppies/common/mtree.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: mtree.conf,v 1.4 1999/08/06 20:49:08 deraadt Exp $
+# $OpenBSD: mtree.conf,v 1.5 2001/06/23 19:44:42 deraadt Exp $
/set type=dir uname=root gname=wheel mode=0755
# .
@@ -35,11 +35,6 @@ mnt2
# ./mnt2
..
-# ./kern
-kern
-# ./kern
-..
-
# ./sbin
sbin
# ./sbin
diff --git a/distrib/i386/floppies/ramdiskC/instbin.conf b/distrib/i386/floppies/ramdiskC/instbin.conf
index 7b732917f00..c15058518ff 100644
--- a/distrib/i386/floppies/ramdiskC/instbin.conf
+++ b/distrib/i386/floppies/ramdiskC/instbin.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: instbin.conf,v 1.1 2001/04/09 06:55:40 deraadt Exp $
+# $OpenBSD: instbin.conf,v 1.2 2001/06/23 19:44:43 deraadt Exp $
#
# instbin.conf - unified binary for the inst/upgr floppies
#
@@ -9,7 +9,7 @@ srcdirs usr.sbin/pppd sys/arch/i386/stand
progs cat chmod cp dd df disklabel dhclient ed
progs fsck_ffs ftp fdisk
progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
-progs mount_ffs mount_msdos mount_kernfs mount_ext2fs
+progs mount_ffs mount_msdos mount_ext2fs
progs mv newfs pax ksh ping reboot rm route
progs sed sleep stty umount wicontrol ancontrol
progs rsh restore gzip grep installboot
diff --git a/distrib/i386/floppies/ramdiskC/list b/distrib/i386/floppies/ramdiskC/list
index ec2629f3daf..878fb4850ed 100644
--- a/distrib/i386/floppies/ramdiskC/list
+++ b/distrib/i386/floppies/ramdiskC/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.2 2001/04/19 02:17:33 deraadt Exp $
+# $OpenBSD: list,v 1.3 2001/06/23 19:44:43 deraadt Exp $
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/instbin instbin
@@ -33,7 +33,6 @@ LINK instbin sbin/mount
LINK instbin sbin/mount_cd9660
LINK instbin sbin/mount_ffs
LINK instbin sbin/mount_msdos
-LINK instbin sbin/mount_kernfs
LINK instbin sbin/mount_ext2fs
LINK instbin sbin/ping
LINK instbin sbin/newfs
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 16:30:41 +0000