4 files changed, 4 insertions, 87 deletions
diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf
index 5f06b3b040..6b08d1dbc2 100644
--- a/usr/src/pkg/manifests/SUNWcs.mf
+++ b/usr/src/pkg/manifests/SUNWcs.mf
@@ -1336,7 +1336,6 @@ file path=usr/sbin/ikecert mode=0555
 file path=usr/sbin/inetadm mode=0555
 file path=usr/sbin/inetconv mode=0555
 file path=usr/sbin/install mode=0555
-file path=usr/sbin/installboot group=sys mode=0555
 file path=usr/sbin/ipaddrsel mode=0555
 file path=usr/sbin/ipsecalgs mode=0555
 file path=usr/sbin/ipsecconf mode=0555
diff --git a/usr/src/psm/stand/bootblks/ufs/Makefile.ufs b/usr/src/psm/stand/bootblks/ufs/Makefile.ufs
index 49a4adb7df..eda5d147cc 100644
--- a/usr/src/psm/stand/bootblks/ufs/Makefile.ufs
+++ b/usr/src/psm/stand/bootblks/ufs/Makefile.ufs
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-#
+# Copyright 2016 Toomas Soome <tsoome@me.com>
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -40,11 +40,6 @@ UFSBOOT_FTH		= $(UFS_DIR)/boot-ufs.fth
 UFS_FTH			= $(UFS_DIR)/ufs.fth
 
 #
-# This program is used to install the boot block
-#
-INSTALLBOOT		= installboot
-
-#
 # Where and how stuff gets installed
 #
 ROOT_PSM_BOOTBLOCK	= $(ROOT_PSM_LIB_UFS_DIR)/$(PROG)
@@ -52,23 +47,9 @@ USR_PSM_BOOTBLOCK	= $(USR_PSM_LIB_UFS_DIR)/$(PROG)
 BOOTBLK_LINK		= $(BOOTBLK_LINK_PREFIX)/ufs/$(PROG)
 
 USR			= $(ROOT)/usr
-USR_SBIN		= $(USR)/sbin
-USR_SBIN_INSTALLBOOT	= $(USR_SBIN)/$(INSTALLBOOT)
-
-#
-# Overrides for installing installboot.
-#
-INS.file.555		= $(RM) $@; $(INS) -s -m 555 -f $(@D) $<
 
 %.fcode:	$(UFS_DIR)/%.fth
 	$(TOKENIZE) $<
 
 $(FS_FCODE):	$(UTIL_FTH) $(UFS_FTH) $(BOOT_FTH)
 	$(TOKENIZE) $(UFSBOOT_FTH)
-
-#
-# install rules
-#
-$(USR_SBIN)/%:	% $(USR_SBIN)
-	$(INS.file.555)
-
diff --git a/usr/src/psm/stand/bootblks/ufs/i386/Makefile b/usr/src/psm/stand/bootblks/ufs/i386/Makefile
index f41d526d30..25e39431c7 100644
--- a/usr/src/psm/stand/bootblks/ufs/i386/Makefile
+++ b/usr/src/psm/stand/bootblks/ufs/i386/Makefile
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-#
+# Copyright 2016 Toomas Soome <tsoome@me.com>
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -49,7 +49,7 @@ $(INSTALL_TARGETS) := FILEMODE = 0444
 PROGS		= mboot
 
 
-all: $(INSTALLBOOT) $(PROGS)
+all: $(PROGS)
 
 $(PROGS): $$(@).exec
 	$(OBJCOPY) -O binary $@.exec $@
@@ -58,7 +58,7 @@ $(PROGS): $$(@).exec
 	$(LD) $(LDFLAGS) -o $@ $(@:exec=o)
 
 
-install: all $(INSTALL_TARGETS) $(USR_SBIN_INSTALLBOOT)
+install: all $(INSTALL_TARGETS)
 
 $(INSTALL_DIR)/%: $(INSTALL_DIR) %
 	$(INS.file)
@@ -73,12 +73,3 @@ clean:
 
 clobber: clean
 	$(RM) $(PROGS) $(INSTALLBOOT)
-
-
-#
-# Pattern matching rules for source in this directory
-#
-%: %.sh
-	$(RM) $@
-	cat $< > $@
-	chmod +x $@
diff --git a/usr/src/psm/stand/bootblks/ufs/i386/installboot.sh b/usr/src/psm/stand/bootblks/ufs/i386/installboot.sh
deleted file mode 100644
index 38ff766f28..0000000000
--- a/usr/src/psm/stand/bootblks/ufs/i386/installboot.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-PATH=/usr/bin
-
-away() {
-	echo $2 1>&2
-	exit $1
-}
-
-Error="Error: `basename $0` is obsolete. Use installgrub(1M)"
-Usage="Usage: `basename $0` --force_realmode pboot bootblk raw-device"
-
-test $# -ne 4 && away 1 "$Error"
-test $1 != "--force_realmode" && away 1 "$Error"
-shift 1
-
-PBOOT=$1
-BOOTBLK=$2
-DEVICE=$3
-test ! -f $PBOOT && away 1 "$PBOOT: File not found"
-test ! -f $BOOTBLK && away 1 "$BOOTBLK: File not found"
-test ! -c $DEVICE && away 1 "$DEVICE: Not a character device"
-test ! -w $DEVICE && away 1 "$DEVICE: Not writeable"
-
-# pboot at block 0, label at blocks 1 and 2, bootblk from block 3 on
-stderr=`dd if=$PBOOT of=$DEVICE bs=1b count=1 conv=sync 2>&1`
-err=$? ; test $err -ne 0 && away $err "$stderr"
-stderr=`dd if=$BOOTBLK of=$DEVICE bs=1b oseek=3 conv=sync 2>&1`
-err=$? ; test $err -ne 0 && away $err "$stderr"
-exit 0