summaryrefslogtreecommitdiff
path: root/distrib/miniroot
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>1998-11-09 03:54:53 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>1998-11-09 03:54:53 +0000
commiteac2027fc25386b5fd387602720c8c5cc362d6f7 (patch)
tree90372e0f2aa4e347ea0f73071c65b8b14d692923 /distrib/miniroot
parentff47464de5e68e9c49fe312c953f54b2e90f546c (diff)
Remove labelmoredisks(), nothing uses it anymore and most install.md's
don't provide a real md_labeldisk() anyway.
Diffstat (limited to 'distrib/miniroot')
-rw-r--r--distrib/miniroot/install.sh3
-rw-r--r--distrib/miniroot/install.sub27
2 files changed, 2 insertions, 28 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index 4ad24a7ef49..cb9594cb16e 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: install.sh,v 1.42 1998/10/28 17:51:14 millert Exp $
+# $OpenBSD: install.sh,v 1.43 1998/11/09 03:54:52 millert Exp $
# $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
#
# Copyright (c) 1997,1998 Todd Miller, Theo de Raadt
@@ -84,7 +84,6 @@ MODE="install"
# md_get_cddevs() - return available CD-ROM devices
# md_get_partition_range() - return range of valid partition letters
# md_installboot() - install boot-blocks on disk
-# md_labeldisk() - put label on a disk
# md_prep_disklabel() - label the root disk
# md_welcome_banner() - display friendly message
# md_not_going_to_install() - display friendly message
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index e9bded3803c..8d336e038d0 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: install.sub,v 1.111 1998/11/03 04:35:16 aaron Exp $
+# $OpenBSD: install.sub,v 1.112 1998/11/09 03:54:52 millert Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997,1998 Todd Miller, Theo de Raadt
@@ -423,31 +423,6 @@ __getrootdisk_1
fi
}
-labelmoredisks() {
- cat << \__labelmoredisks_1
-
-You may label the following disks:
-
-__labelmoredisks_1
- echo "$_DKDEVS"
- echo ""
- echo -n "Label which disk? [done] "
- getresp "done"
- case "$resp" in
- done)
- ;;
-
- *)
- if isin $resp $_DKDEVS ; then
- md_labeldisk $resp
- else
- echo ""
- echo "The disk $resp does not exist."
- fi
- ;;
- esac
-}
-
addhostent() {
# $1 - IP address
# $2 - symbolic name