Date: Mon, 06 May 2002 08:12:05 +0000 From: Dima Dorfman <dima@trit.org> To: audit@freebsd.org Subject: sysctl -> sysctl -w Message-ID: <20020506081205.4E1DB3E5C@turbine.trit.org>
next in thread | raw e-mail | index | archive | help
Since the sysctl -w option was deprecated, we've occasionally seen
commits that remove its usage from various parts of the tree. Instead
of seeing this go on in piecemeal, I'd like to fix most of them in one
commit. The following patch fixes this everywhere except contrib/,
some of the KAME stuff (it should stay there, since KAME supports
other BSDs, which still require -w), and some stuff that's still on a
vendor branch (share/doc/smm and some stuff in picobsd; I didn't think
it was worth taking it off for something like this).
If anyone knows why I shouldn't commit this, please speak up.
Thanks.
Index: UPDATING
===================================================================
RCS file: /ref/cvsf/src/UPDATING,v
retrieving revision 1.203
diff -u -r1.203 UPDATING
--- UPDATING 25 Apr 2002 14:41:39 -0000 1.203
+++ UPDATING 6 May 2002 07:57:59 -0000
@@ -861,7 +861,7 @@
If you have really bad/marginal IDE drives, you may find they
don't work well. Use pio mode instead. The easiest way to
cope if you have a problem combination is to add:
- /sbin/sysctl -w hw.atamodes=pio,pio,pio,pio
+ /sbin/sysctl hw.atamodes=pio,pio,pio,pio
to the start of /etc/rc.conf.
20000319:
Index: release/picobsd/dial/floppy.tree/etc/mfs.rc
===================================================================
RCS file: /ref/cvsf/src/release/picobsd/dial/floppy.tree/etc/mfs.rc,v
retrieving revision 1.3
diff -u -r1.3 mfs.rc
--- release/picobsd/dial/floppy.tree/etc/mfs.rc 25 Apr 2000 18:59:56 -0000 1.3
+++ release/picobsd/dial/floppy.tree/etc/mfs.rc 6 May 2002 08:03:02 -0000
@@ -13,7 +13,7 @@
trap "echo 'Reboot interrupted'; exit 1" 3
-sysctl -w vm.defer_swapspace_pageouts=1 vm.disable_swapspace_pageouts=1 2>&1 >/dev/null
+sysctl vm.defer_swapspace_pageouts=1 vm.disable_swapspace_pageouts=1 2>&1 >/dev/null
echo ""
echo "-------------------------------------------"
Index: release/picobsd/mfs_tree/etc/rc.network
===================================================================
RCS file: /ref/cvsf/src/release/picobsd/mfs_tree/etc/rc.network,v
retrieving revision 1.4
diff -u -r1.4 rc.network
--- release/picobsd/mfs_tree/etc/rc.network 8 Mar 2002 12:33:48 -0000 1.4
+++ release/picobsd/mfs_tree/etc/rc.network 6 May 2002 08:02:13 -0000
@@ -59,16 +59,16 @@
echo -n 'Additional routing options:'
if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then
echo -n ' tcp_extensions=NO'
- sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1
- sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1
+ sysctl net.inet.tcp.rfc1323=0 >/dev/null 2>&1
+ sysctl net.inet.tcp.rfc1644=0 >/dev/null 2>&1
fi
if [ "X$gateway_enable" = X"YES" ]; then
echo -n ' IP_gateway=YES'
- sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1
+ sysctl net.inet.ip.forwarding=1 >/dev/null 2>&1
fi
if [ "X$arpproxy_all" = X"YES" ]; then
echo -n ' turning on ARP_PROXY_ALL: '
- sysctl -w net.link.ether.inet.proxyall=1 2>&1
+ sysctl net.link.ether.inet.proxyall=1 2>&1
fi
echo '.'
network_pass1_done=YES # Let future generations know we made it.
Index: release/picobsd/net/floppy.tree/etc/rc.network
===================================================================
RCS file: /ref/cvsf/src/release/picobsd/net/floppy.tree/etc/rc.network,v
retrieving revision 1.6
diff -u -r1.6 rc.network
--- release/picobsd/net/floppy.tree/etc/rc.network 28 Aug 1999 01:33:41 -0000 1.6
+++ release/picobsd/net/floppy.tree/etc/rc.network 6 May 2002 08:01:55 -0000
@@ -55,16 +55,16 @@
echo -n 'Additional routing options:'
if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then
echo -n ' tcp_extensions=NO'
- sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1
- sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1
+ sysctl net.inet.tcp.rfc1323=0 >/dev/null 2>&1
+ sysctl net.inet.tcp.rfc1644=0 >/dev/null 2>&1
fi
if [ "X$gateway_enable" = X"YES" ]; then
echo -n ' IP_gateway=YES'
- sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1
+ sysctl net.inet.ip.forwarding=1 >/dev/null 2>&1
fi
if [ "X$arpproxy_all" = X"YES" ]; then
echo -n ' turning on ARP_PROXY_ALL: '
- sysctl -w net.link.ether.inet.proxyall=1 2>&1
+ sysctl net.link.ether.inet.proxyall=1 2>&1
fi
echo '.'
network_pass1_done=YES # Let future generations know we made it.
Index: release/picobsd/router/floppy.tree/etc/mfs.rc
===================================================================
RCS file: /ref/cvsf/src/release/picobsd/router/floppy.tree/etc/mfs.rc,v
retrieving revision 1.2
diff -u -r1.2 mfs.rc
--- release/picobsd/router/floppy.tree/etc/mfs.rc 28 Aug 1999 01:33:49 -0000 1.2
+++ release/picobsd/router/floppy.tree/etc/mfs.rc 6 May 2002 08:01:32 -0000
@@ -6,7 +6,7 @@
set HOME=/
set PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin
-sysctl -w vm.defer_swapspace_pageouts=1 vm.disable_swapspace_pageouts=1
+sysctl vm.defer_swapspace_pageouts=1 vm.disable_swapspace_pageouts=1
### Special setup for one floppy PICOBSD ###
echo
Index: share/examples/isdn/FAQ
===================================================================
RCS file: /ref/cvsf/src/share/examples/isdn/FAQ,v
retrieving revision 1.10
diff -u -r1.10 FAQ
--- share/examples/isdn/FAQ 1 May 2001 09:14:56 -0000 1.10
+++ share/examples/isdn/FAQ 6 May 2002 08:00:05 -0000
@@ -634,7 +634,7 @@
This can easily be checked by doing ``sysctl net.inet.tcp.rfc1323''. If the
result is 1, then the RFC1323 support is turned on.
-Turn this off by doing ``sysctl -w net.inet.tcp.rfc1323=0'' (This is
+Turn this off by doing ``sysctl net.inet.tcp.rfc1323=0'' (This is
called "net.inet.tcp.do_rfc1323" under BSD/OS).
For FreeBSD make sure that tcp_extension="NO" is in your /etc/rc.conf
Index: sys/compat/linux/linux_mib.c
===================================================================
RCS file: /ref/cvsf/src/sys/compat/linux/linux_mib.c,v
retrieving revision 1.15
diff -u -r1.15 linux_mib.c
--- sys/compat/linux/linux_mib.c 3 Dec 2001 16:12:25 -0000 1.15
+++ sys/compat/linux/linux_mib.c 6 May 2002 07:59:50 -0000
@@ -316,9 +316,9 @@
}
/*
- * Usage: sysctl -w linux.debug=<syscall_nr>.<0/1>
+ * Usage: sysctl linux.debug=<syscall_nr>.<0/1>
*
- * E.g.: sysctl -w linux.debug=21.0
+ * E.g.: sysctl linux.debug=21.0
*
* As a special case, syscall "all" will apply to all syscalls globally.
*/
Index: sys/conf/kern.post.mk
===================================================================
RCS file: /ref/cvsf/src/sys/conf/kern.post.mk,v
retrieving revision 1.17
diff -u -r1.17 kern.post.mk
--- sys/conf/kern.post.mk 1 May 2002 03:28:14 -0000 1.17
+++ sys/conf/kern.post.mk 6 May 2002 07:59:24 -0000
@@ -150,7 +150,7 @@
fi ; \
mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old ; \
if [ "$$thiskernel" = ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
- sysctl -w kern.bootfile=${DESTDIR}${KODIR}.old/${KERNEL_KO} ; \
+ sysctl kern.bootfile=${DESTDIR}${KODIR}.old/${KERNEL_KO} ; \
fi; \
fi
.endif
Index: sys/dev/bktr/bktr_card.h
===================================================================
RCS file: /ref/cvsf/src/sys/dev/bktr/bktr_card.h,v
retrieving revision 1.4
diff -u -r1.4 bktr_card.h
--- sys/dev/bktr/bktr_card.h 26 Jun 2000 09:41:31 -0000 1.4
+++ sys/dev/bktr/bktr_card.h 6 May 2002 07:58:46 -0000
@@ -54,7 +54,7 @@
* eg options BKTR_OVERRIDE CARD=1
*
* or using the sysclt hw.bt848.card
- * eg sysctl -w hw.bt848.card=1
+ * eg sysctl hw.bt848.card=1
*
* where <card type> is one of the following card defines.
*/
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-audit" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020506081205.4E1DB3E5C>