diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-09-08 01:02:06 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-09-08 01:02:06 -0300 |
| commit | ede246d73091a7b733ae56819fc7296e18aa4c31 (patch) | |
| tree | d9913f474acc8d023605c90ba088d1b84ef3275a /rc.conf | |
| parent | e70da9aade583714d399adb35573aecbea84f5f7 (diff) | |
| parent | 7cccf54fcb9fab459590b8b6fd5c51f2088e3b2e (diff) | |
Merge branch 'master' of git://projects.archlinux.org/initscripts2011.09.8
Conflicts:
functions
Diffstat (limited to 'rc.conf')
| -rw-r--r-- | rc.conf | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -9,10 +9,12 @@ # LOCALE: available languages can be listed with the 'locale -a' command # 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 +# 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. +# 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 @@ -64,7 +66,7 @@ HOSTNAME="myhost" # Wired network setup # - interface: name of device (required) # - address: IP address (leave blank for DHCP) -# - netmask: subnet mask (ignored 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) # |