summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2012-04-06 15:11:30 +0000
committerjsing <jsing@openbsd.org>2012-04-06 15:11:30 +0000
commitcdf186d3c0254f2d87217e99363e313f817a108e (patch)
tree7a5d209d3ae2a6024b83de9ef0da7d60619b6a07
parenttedu the raidframe. (diff)
downloadwireguard-openbsd-cdf186d3c0254f2d87217e99363e313f817a108e.tar.xz
wireguard-openbsd-cdf186d3c0254f2d87217e99363e313f817a108e.zip
tedu the raidctl.
ok deraadt@
-rw-r--r--etc/rc12
-rw-r--r--sbin/Makefile4
2 files changed, 3 insertions, 13 deletions
diff --git a/etc/rc b/etc/rc
index c4edad4301c..e2bb07ca364 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.399 2012/03/10 10:37:13 dlg Exp $
+# $OpenBSD: rc,v 1.400 2012/04/06 15:11:30 jsing Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -264,16 +264,6 @@ if [ X"$1" = X"shutdown" ]; then
exit 0
fi
-# Configure raid devices.
-for dev in 0 1 2 3; do
- if [ -f /etc/raid$dev.conf ]; then
- raidctl -c /etc/raid$dev.conf raid$dev
- fi
-done
-
-# Check parity on raid devices.
-raidctl -P all
-
swapctl -A -t blk
if [ -e /fastboot ]; then
diff --git a/sbin/Makefile b/sbin/Makefile
index 64fe1169aba..7f52bad9876 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.95 2011/10/06 20:49:28 deraadt Exp $
+# $OpenBSD: Makefile,v 1.96 2012/04/06 15:11:30 jsing Exp $
SUBDIR= atactl badsect bioctl clri dhclient \
disklabel dmesg dump dumpfs fdisk fsck fsck_ext2fs fsck_ffs \
@@ -8,7 +8,7 @@ SUBDIR= atactl badsect bioctl clri dhclient \
mount_nfs mount_ntfs mount_procfs mount_udf \
mount_vnd mount_nnpfs mountd ncheck_ffs newfs newfs_ext2fs newfs_msdos \
nfsd nologin pdisk pfctl pflogd ping ping6 quotacheck \
- raidctl reboot restore route rtsol savecore scan_ffs \
+ reboot restore route rtsol savecore scan_ffs \
scsi shutdown slattach swapctl sysctl ttyflags tunefs \
umount wsconsctl