[src/trunk]: src/etc/defaults Revert last change. This was already fixed diff...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2d8f0c13750a
branches:  trunk
changeset: 332522:2d8f0c13750a
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Sep 26 11:04:06 2014 +0000

description:
Revert last change. This was already fixed differently and something
went wrong with the change anyway. Sorry

diffstat:

 etc/defaults/rc.conf |  313 +++++++++++++++++++++++++-------------------------
 1 files changed, 156 insertions(+), 157 deletions(-)

diffs (truncated from 348 to 300 lines):

diff -r 25826ae7c35f -r 2d8f0c13750a etc/defaults/rc.conf
--- a/etc/defaults/rc.conf      Fri Sep 26 10:36:11 2014 +0000
+++ b/etc/defaults/rc.conf      Fri Sep 26 11:04:06 2014 +0000
@@ -1,188 +1,187 @@
-#      $NetBSD: rc.conf,v 1.127 2014/09/26 10:36:11 tron Exp $
- #
- # /etc/defaults/rc.conf --
- #     default configuration of /etc/rc.conf
- #
- # see rc.conf(5) for more information.
- #
- # DO NOT EDIT THIS FILE DIRECTLY; IT MAY BE REPLACED DURING A SYSTEM UPGRADE.
- # EDIT /etc/rc.conf INSTEAD.
- #
+#      $NetBSD: rc.conf,v 1.128 2014/09/26 11:04:06 tron Exp $
+#
+# /etc/defaults/rc.conf --
+#      default configuration of /etc/rc.conf
+#
+# see rc.conf(5) for more information.
+#
+# DO NOT EDIT THIS FILE DIRECTLY; IT MAY BE REPLACED DURING A SYSTEM UPGRADE.
+# EDIT /etc/rc.conf INSTEAD.
+#
 
- #
- # Use program=YES to enable program, NO to disable it. program_flags are
- # passed to the program on the command line.
- #
+#
+# Use program=YES to enable program, NO to disable it. program_flags are
+# passed to the program on the command line.
+#
 
- # Uncomment this if you want to use local paths in rc.
- #
- #export PATH=$PATH:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin
+# Uncomment this if you want to use local paths in rc.
+#
+#export PATH=$PATH:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin
 
- # Uncomment the following to execute each /etc/rc.d script in
- # the current shell rather than in a subshell.  This may be
- # faster on very slow machines that have an expensive fork(2).
- #     NOTE:   USE THIS AT YOUR OWN RISK; A ROGUE COMMAND
- #             MAY INADVERTENTLY PREVENT BOOT TO MULTIUSER.
- #
- #rc_fast_and_loose=YES
+# Uncomment the following to execute each /etc/rc.d script in
+# the current shell rather than in a subshell.  This may be
+# faster on very slow machines that have an expensive fork(2).
+#      NOTE:   USE THIS AT YOUR OWN RISK; A ROGUE COMMAND
+#              MAY INADVERTENTLY PREVENT BOOT TO MULTIUSER.
+#
+#rc_fast_and_loose=YES
 
- # If rc_silent is true then /etc/rc will suppress most output to
- # the console.  The default is taken from the AB_SILENT flag passed
- # from the boot loader to the kernel in the boothowto(9) variable.
- #
- # rc_silent_cmd is executed once for each suppressed line of output.
- # Useful values are ":" and "twiddle".
- #
- rc_silent=$( [ "$(( $(/sbin/sysctl -n kern.boothowto 2>/dev/null || echo 0) \
-                    & 0x40000 ))" != 0 ] && echo true || echo false )
- rc_silent_cmd=twiddle
+# If rc_silent is true then /etc/rc will suppress most output to
+# the console.  The default is taken from the AB_SILENT flag passed
+# from the boot loader to the kernel in the boothowto(9) variable.
+#
+# rc_silent_cmd is executed once for each suppressed line of output.
+# Useful values are ":" and "twiddle".
+#
+rc_silent=$( [ "$(( $(/sbin/sysctl -n kern.boothowto 2>/dev/null || echo 0) \
+                   & 0x40000 ))" != 0 ] && echo true || echo false )
+rc_silent_cmd=twiddle
 
- # Additional flags to the rcorder(8) that's run by /etc/rc.
- #
- rc_rcorder_flags=""
+# Additional flags to the rcorder(8) that's run by /etc/rc.
+#
+rc_rcorder_flags=""
 
- # The directories searched for rc scripts.
- # These directories must be part of the root file system.
- rc_directories=/etc/rc.d 
+# The directories searched for rc scripts.
+# These directories must be part of the root file system.
+rc_directories=/etc/rc.d 
 
- # If this is set to NO, shutdown(8) will not run /etc/rc.shutdown.
- #
- do_rcshutdown=YES
+# If this is set to NO, shutdown(8) will not run /etc/rc.shutdown.
+#
+do_rcshutdown=YES
 
- # Additional flags to the rcorder(8) that's run by /etc/rc.shutdown.
- #
- rcshutdown_rcorder_flags=""
+# Additional flags to the rcorder(8) that's run by /etc/rc.shutdown.
+#
+rcshutdown_rcorder_flags=""
 
- # If this is non-blank, use as the number of seconds to run a watchdog
- # timer which will terminate /etc/rc.shutdown if the timeout expires.
- #
- rcshutdown_timeout=""
+# If this is non-blank, use as the number of seconds to run a watchdog
+# timer which will terminate /etc/rc.shutdown if the timeout expires.
+#
+rcshutdown_timeout=""
 
 
- # Basic network configuration
- #
+# Basic network configuration
+#
 
- # Fully Qualified Internet Domain Name (a.k.a. hostname, e.g. foo.baz.edu).
- # If blank, use /etc/myname.
- #
- hostname=""
+# Fully Qualified Internet Domain Name (a.k.a. hostname, e.g. foo.baz.edu).
+# If blank, use /etc/myname.
+#
+hostname=""
 
- # If there's only one way out of your IPv4 network, set this to the hostname
- # or the IPv4 address of the router that will get your packets off the LAN.
- # If blank, use /etc/mygate.
- #
- defaultroute=""
+# If there's only one way out of your IPv4 network, set this to the hostname
+# or the IPv4 address of the router that will get your packets off the LAN.
+# If blank, use /etc/mygate.
+#
+defaultroute=""
 
- # Same thing for IPv6.  If blank, use /etc/mygate6.
- #
- defaultroute6=""
+# Same thing for IPv6.  If blank, use /etc/mygate6.
+#
+defaultroute6=""
 
- # The NIS domain name (formerly known as Yellow Pages); not in any way
- # related to Internet domain names.
- # If blank, use /etc/defaultdomain.
- #
- domainname=""
+# The NIS domain name (formerly known as Yellow Pages); not in any way
+# related to Internet domain names.
+# If blank, use /etc/defaultdomain.
+#
+domainname=""
 
- # Filesystems to mount early in boot-up.
- # Note that `/var' is needed in $critical_filesystems_local (or
- # implied as part of `/') as certain services that need /var (such as
- # dhclient) may be needed to get the network operational enough to mount
- # the $critical_filesystems_remote.  Prepending "OPTIONAL:"  means it
- # will not be an error if that file system is not present in fstab(5).
- #
- critical_filesystems_local="OPTIONAL:/var"
- critical_filesystems_remote="OPTIONAL:/usr"
+# Filesystems to mount early in boot-up.
+# Note that `/var' is needed in $critical_filesystems_local (or
+# implied as part of `/') as certain services that need /var (such as
+# dhclient) may be needed to get the network operational enough to mount
+# the $critical_filesystems_remote.  Prepending "OPTIONAL:"  means it
+# will not be an error if that file system is not present in fstab(5).
+#
+critical_filesystems_local="OPTIONAL:/var"
+critical_filesystems_remote="OPTIONAL:/usr"
 
- # Swap device controls.
- #
- no_swap=NO            # Set to YES if you have purposefully setup no swap
-                        # partitions and don't want to be warned about it.
- swapoff=YES           # Remove block-type swap partitions upon shutdown
-                        # This defaults to yes, so that raids shutdown cleanly
+# Swap device controls.
+#
+no_swap=NO             # Set to YES if you have purposefully setup no swap
+                       # partitions and don't want to be warned about it.
+swapoff=YES            # Remove block-type swap partitions upon shutdown
+                       # This defaults to yes, so that raids shutdown cleanly
 
- # Concatenated disk driver.
- #
- ccd=YES
+# Concatenated disk driver.
+#
+ccd=YES
 
- # RAIDframe driver (manually configured devices).
- #
- raidframe=YES
+# RAIDframe driver (manually configured devices).
+#
+raidframe=YES
 
- # Crypto file system.
- #
- cgd=YES
+# Crypto file system.
+#
+cgd=YES
 
- # Logical Volume Manager
- #
- lvm=NO
+# Logical Volume Manager
+#
+lvm=NO
 
- # One-time actions and programs on boot-up.
- #
- savecore=YES          savecore_flags="-z"
-                        savecore_dir="/var/crash"
- per_user_tmp=NO                                       # per-user /tmp directories
- per_user_tmp_dir="/private/tmp"                       # real storage for /tmp
- clear_tmp=YES                                 # clear /tmp after reboot
- update_motd=YES                                       # updates /etc/motd
- dmesg=YES             dmesg_flags=""          # write /var/run/dmesg.boot
- accounting=NO                                 # uses /var/account/acct
- newsyslog=NO          newsyslog_flags=""      # trim log files
- quota=YES                                     # check and enable quotas
- ldconfig=YES                                  # rebuild a.out ldconfig cache
- sysdb=YES                                     # build system databases
- rndctl=NO             rndctl_flags=""         # configure rndctl(8)
- gpio=NO                                               # configure GPIO devices
+# One-time actions and programs on boot-up.
+#
+savecore=YES           savecore_flags="-z"
+                       savecore_dir="/var/crash"
+per_user_tmp=NO                                        # per-user /tmp directories
+per_user_tmp_dir="/private/tmp"                        # real storage for /tmp
+clear_tmp=YES                                  # clear /tmp after reboot
+update_motd=YES                                        # updates /etc/motd
+dmesg=YES              dmesg_flags=""          # write /var/run/dmesg.boot
+accounting=NO                                  # uses /var/account/acct
+newsyslog=NO           newsyslog_flags=""      # trim log files
+quota=YES                                      # check and enable quotas
+ldconfig=YES                                   # rebuild a.out ldconfig cache
+sysdb=YES                                      # build system databases
+rndctl=NO              rndctl_flags=""         # configure rndctl(8)
+gpio=NO                                                # configure GPIO devices
 
- # cope with other OSes using the real time clock at localtime on this
- # machine (by adjusting kern.rtc_offset at boot)
- rtclocaltime=NO
+# cope with other OSes using the real time clock at localtime on this
+# machine (by adjusting kern.rtc_offset at boot)
+rtclocaltime=NO
 
- # NOTE: default coredump name now set in /etc/sysctl.conf
+# NOTE: default coredump name now set in /etc/sysctl.conf
 
- #
- # File system check flags; default to preen mode, checking file systems
- # that are listed in /etc/fstab in parallel as the fsck pass number
- # permits. Fix minor faults automatically, and exit with non 0 only
- # when major errors occur.
- #
- fsck_flags=-p
+#
+# File system check flags; default to preen mode, checking file systems
+# that are listed in /etc/fstab in parallel as the fsck pass number
+# permits. Fix minor faults automatically, and exit with non 0 only
+# when major errors occur.
+#
+fsck_flags=-p
 
- # Security setting.  If $securelevel is non-empty, the system securelevel
- # is set to this value early in the boot sequence.  Otherwise the default
- # action is taken (see init(8)).
- #
- securelevel=""                                        # securelevel to set to
+# Security setting.  If $securelevel is non-empty, the system securelevel
+# is set to this value early in the boot sequence.  Otherwise the default
+# action is taken (see init(8)).
+#
+securelevel=""                                 # securelevel to set to
 
- # To set the IP address of an interface either use
- #  ifconfig_xxN="IP-NO"
- # where xxN is the interface.  If this variable is not set then
- # contents of the file /etc/ifconfig.xxN is used.
+# To set the IP address of an interface either use
+#  ifconfig_xxN="IP-NO"
+# where xxN is the interface.  If this variable is not set then
+# contents of the file /etc/ifconfig.xxN is used.
 
- # Networking startup.
- #
- mdnsd=NO
- npf=NO