Merge git://projects.archlinux.org/initscripts

1 files changed, 12 insertions, 95 deletions

diff --git a/rc.conf b/rc.conf
index c9dcb46..b3b1698 100644
--- a/rc.conf
+++ b/rc.conf
@@ -1,88 +1,30 @@
 #
 # /etc/rc.conf - Main Configuration for Parabola GNU/Linux-Libre
 #
+# See 'man 5 rc.conf' for more details
+#
 
-# -----------------------------------------------------------------------
 # LOCALIZATION
-# -----------------------------------------------------------------------
-#
-# LOCALE: available languages can be listed with the 'locale -a' command
-#   LANG in /etc/locale.conf takes precedence
-# DAEMON_LOCALE: If set to 'yes', use $LOCALE as the locale during daemon
-# startup and during the boot process. If set to 'no', the C locale is used.
-# HARDWARECLOCK: set to "", "UTC" or "localtime", any other value will result
-#   in the hardware clock being left untouched (useful for virtualization)
-#   Note: Using "localtime" is discouraged, using "" makes hwclock fall back
-#   to the value in /var/lib/hwclock/adjfile
-# TIMEZONE: timezones are found in /usr/share/zoneinfo
-#   Note: if unset, the value in /etc/localtime is used unchanged
-# KEYMAP: keymaps are found in /usr/share/kbd/keymaps
-# CONSOLEFONT: found in /usr/share/kbd/consolefonts (only needed for non-US)
-# CONSOLEMAP: found in /usr/share/kbd/consoletrans
-# USECOLOR: use ANSI color sequences in startup messages
-#
-LOCALE="en_US.UTF-8"
-DAEMON_LOCALE="no"
-HARDWARECLOCK="UTC"
-TIMEZONE="Canada/Pacific"
-KEYMAP="us"
+# ------------
+HARDWARECLOCK=
+TIMEZONE=
+KEYMAP=
 CONSOLEFONT=
 CONSOLEMAP=
+LOCALE=
+DAEMON_LOCALE="yes"
 USECOLOR="yes"
 
-# -----------------------------------------------------------------------
 # HARDWARE
-# -----------------------------------------------------------------------
-#
-# MODULES: Modules to load at boot-up. Blacklisting is no longer supported.
-#   Replace every !module by an entry as on the following line in a file in
-#   /etc/modprobe.d:
-#     blacklist module
-#   See "man modprobe.conf" for details.
-#
+# --------
 MODULES=()
-
-# Udev settle timeout (default to 30)
-UDEV_TIMEOUT=30
-
-# Scan for FakeRAID (dmraid) Volumes at startup
 USEDMRAID="no"
-
-# Scan for BTRFS volumes at startup
 USEBTRFS="no"
-
-# Scan for LVM volume groups at startup, required if you use LVM
 USELVM="no"
 
-# -----------------------------------------------------------------------
 # NETWORKING
-# -----------------------------------------------------------------------
-#
-# HOSTNAME: Hostname of machine. Should also be put in /etc/hosts
-#
-HOSTNAME="myhost"
-
-# Use 'ip addr' or 'ls /sys/class/net/' to see all available interfaces.
-#
-# Wired network setup
-#   - interface: name of device (required)
-#   - address: IP address (leave blank for DHCP)
-#   - netmask: subnet mask (ignored for DHCP) (optional, defaults to 255.255.255.0)
-#   - broadcast: broadcast address (ignored for DHCP) (optional)
-#   - gateway: default route (ignored for DHCP)
-# 
-# Static IP example
-# interface=eth0
-# address=192.168.0.2
-# netmask=255.255.255.0
-# broadcast=192.168.0.255
-# gateway=192.168.0.1
-#
-# DHCP example
-# interface=eth0
-# address=
-# netmask=
-# gateway=
+# ----------
+HOSTNAME=
 
 interface=
 address=
@@ -90,34 +32,9 @@ netmask=
 broadcast=
 gateway=
 
-# Setting this to "yes" will skip network shutdown.
-# This is required if your root device is on NFS.
 NETWORK_PERSIST="no"
 
-# Enable these netcfg profiles at boot-up. These are useful if you happen to
-# need more advanced network features than the simple network service
-# supports, such as multiple network configurations (ie, laptop users)
-#   - set to 'menu' to present a menu during boot-up (dialog package required)
-#   - prefix an entry with a ! to disable it
-#
-# Network profiles are found in /etc/network.d
-#
-# This requires the netcfg package
-#
-#NETWORKS=(main)
-
-# -----------------------------------------------------------------------
 # DAEMONS
-# -----------------------------------------------------------------------
-#
-# Daemons to start at boot-up (in this order)
-#   - prefix a daemon with a ! to disable it
-#   - prefix a daemon with a @ to start it up in the background
-#
-# If you are sure nothing else touches your hardware clock (such as ntpd or
-# a dual-boot), you might want to enable 'hwclock'. Note that this will only
-# make a difference if the hwclock program has been calibrated correctly.
-#
-# If you use a network filesystem you should enable 'netfs'.
+# -------
 #
 DAEMONS=(metalog network crond)