bin/108360: Remove /usr/sbin/vnconfig from base

[Alex Kozlov]

The following reply was made to PR bin/108360; it has been noted by GNATS.

From: Alex Kozlov <spam at rm-rf.kiev.ua>
To: bug-followup at freebsd.org, spam at rm-rf.kiev.ua, phk at freebsd.org
Cc:  
Subject: Re: bin/108360: Remove /usr/sbin/vnconfig from base
Date: Thu, 1 Feb 2007 04:18:41 +0200

 Hi
 
 Just to clean all remaining traces:
 
 
 Index: src/sbin/mdconfig/Makefile
 @@ -2,7 +2,6 @@
  
  PROG=		mdconfig
  MAN=		mdconfig.8
 -MLINKS=		mdconfig.8 vnconfig.8
  
  DPADD=	${LIBUTIL}
  LDADD=	-lutil
 Index: src/release/scripts/doFS.sh
 @@ -29,33 +29,6 @@
  	FSSIZE=$(roundup $(($sk*12/10)) 1024)
  fi
  
 -dofs_vn () {
 -	if [ "x$VNDEVICE" = "x" ] ; then
 -		VNDEVICE=vn0
 -	fi
 -	u=`expr $VNDEVICE : 'vn\([0-9]*\)' || true`
 -	VNDEVICE=vnn$u
 -
 -	rm -f /dev/*vnn*
 -	mknod /dev/rvnn${u} c 43 `expr 65538 + $u '*' 8`
 -	mknod /dev/rvnn${u}c c 43 `expr 2 + $u '*' 8`
 -	mknod /dev/vnn${u} b 15 `expr 65538 + $u '*' 8`
 -	mknod /dev/vnn${u}c b 15 `expr 2 + $u '*' 8`
 -
 -	umount /dev/${VNDEVICE} 2>/dev/null || true
 -	umount ${MNT} 2>/dev/null || true
 -	vnconfig -u /dev/r${VNDEVICE} 2>/dev/null || true
 -
 -	vnconfig -s labels -c /dev/r${VNDEVICE} ${FSIMG}
 -
 -	trap "umount ${MNT}; vnconfig -u /dev/r${VNDEVICE}; rm -f /dev/*vnn*" EXIT
 -
 -	disklabel -w ${BOOT} ${VNDEVICE} ${FSLABEL}
 -	newfs -i ${FSINODE} -o space -m 0 /dev/r${VNDEVICE}c
 -
 -	mount /dev/${VNDEVICE}c ${MNT}
 -}
 -
  dofs_md () {
  	if [ "x${MDDEVICE}" != "x" ] ; then
  		umount /dev/${MDDEVICE} 2>/dev/null || true
 @@ -89,27 +62,12 @@
  # so we have to specifically specify -r when we don't have -B.
  # bsdlabel fails otherwise.
  #
 -case `uname -r` in
 -4.*)
 -	if [ -f "${RD}/trees/base/boot/boot1" ]; then
 -		BOOT="-B -b ${RD}/trees/base/boot/boot1"
 -		if [ -f "${RD}/trees/base/boot/boot2" ]; then
 -			BOOT="${BOOT} -s ${RD}/trees/base/boot/boot2"
 -		fi
 -	else
 -		BOOT="-r"
 -	fi
 -	dofs_vn
 -	;;
 -*)
 -	if [ -f "${RD}/trees/base/boot/boot" ]; then
 -		BOOT="-B -b ${RD}/trees/base/boot/boot"
 -	else
 -		BOOT="-r"
 -	fi
 -	dofs_md
 -	;;
 -esac
 +if [ -f "${RD}/trees/base/boot/boot" ]; then
 +	BOOT="-B -b ${RD}/trees/base/boot/boot"
 +else
 +	BOOT="-r"
 +fi
 +dofs_md
  
  if [ -d ${FSPROTO} ]; then
  	(set -e && cd ${FSPROTO} && find . -print | cpio -dump ${MNT})
 Index: src/usr.sbin/crunch/examples/really-big.conf
 @@ -72,7 +72,7 @@
  progs iostat iteconfig kvm_mkdb mrouted mtree named portmap pppd
  progs pstat pwd_mkdb quot quotaon rarpd rbootd repquota rmt rpc.bootparamd
  progs rwhod sa sliplogin slstats spray sysctl syslogd tcpdump
 -progs traceroute trpt trsp update vipw vnconfig ypbind yppoll ypset
 +progs traceroute trpt trsp update vipw ypbind yppoll ypset
  
  special amd srcdir /usr/src/usr.sbin/amd/amd
  special amd objs vers.amd.o afs_ops.o am_ops.o clock.o util.o xutil.o efs_ops.o mapc.o info_file.o info_hes.o info_ndbm.o info_passwd.o info_nis.o info_union.o map.o srvr_afs.o srvr_nfs.o mntfs.o misc_rpc.o mount_fs.o mtab.o mtab_bsd.o nfs_ops.o nfs_prot_svc.o nfs_start.o nfs_subr.o opts.o pfs_ops.o rpc_fwd.o sched.o sfs_ops.o amq_svc.o amq_subr.o umount_fs.o host_ops.o nfsx_ops.o ufs_ops.o ifs_ops.o amd.o get_args.o restart.o wire.o
 Index: src/tools/tools/tinybsd/conf/bridge/tinybsd.basefiles
 @@ -223,7 +223,6 @@
  usr/sbin/traceroute
  usr/sbin/vidcontrol
  usr/sbin/vipw
 -usr/sbin/vnconfig
  usr/sbin/watch
  usr/sbin/wicontrol
  usr/sbin/pccardc
 Index: src/tools/tools/tinybsd/conf/default/tinybsd.basefiles
 @@ -234,7 +234,6 @@
  usr/sbin/traceroute
  usr/sbin/vidcontrol
  usr/sbin/vipw
 -usr/sbin/vnconfig
  usr/sbin/watch
  usr/sbin/wicontrol
  usr/sbin/pccardc
 Index: src/tools/tools/tinybsd/conf/firewall/tinybsd.basefiles
 @@ -229,7 +229,6 @@
  usr/sbin/traceroute
  usr/sbin/vidcontrol
  usr/sbin/vipw
 -usr/sbin/vnconfig
  usr/sbin/watch
  
  # contents of ${WORKDIR}/usr/libexec
 Index: src/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles
 @@ -214,7 +214,6 @@
  usr/sbin/traceroute
  usr/sbin/vidcontrol
  usr/sbin/vipw
 -usr/sbin/vnconfig
  usr/sbin/watch
  
  # contents of ${WORKDIR}/usr/libexec
 Index: src/tools/tools/tinybsd/conf/wireless/tinybsd.basefiles
 @@ -221,7 +221,6 @@
  usr/sbin/traceroute
  usr/sbin/vidcontrol
  usr/sbin/vipw
 -usr/sbin/vnconfig
  usr/sbin/watch
  usr/sbin/wicontrol
  usr/sbin/pccardc
 Index: src/tools/tools/tinybsd/conf/wrap/tinybsd.basefiles
 @@ -221,7 +221,6 @@
  usr/sbin/traceroute
  usr/sbin/vidcontrol
  usr/sbin/vipw
 -usr/sbin/vnconfig
  usr/sbin/watch
  usr/sbin/wicontrol
  usr/sbin/pccardc
 
 
 --
 Adios