diff options
| author | Tom Gundersen <teg@jklm.no> | 2012-01-18 23:13:37 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2012-01-18 23:13:37 +0100 |
| commit | 97f0cd6751e8d22c14d7492cdc2186cf41157ba6 (patch) | |
| tree | 59d56727a4e47861280b40192326b747b3b1112b | |
| parent | 5dd3fbaa93c157cfa37351324de06096f4377808 (diff) | |
| parent | deeae735ba6cf0951fd3234a208047c831d7478b (diff) | |
| download | initscripts-97f0cd6751e8d22c14d7492cdc2186cf41157ba6.tar.xz | |
Merge branch 'bikeshed'
| -rw-r--r-- | rc.conf | 21 | ||||
| -rw-r--r-- | rc.conf.5.txt | 2 |
2 files changed, 6 insertions, 17 deletions
@@ -4,10 +4,8 @@ # See 'man 5 rc.conf' for more details # -# ----------------------------------------------------------------------- # LOCALIZATION -# ----------------------------------------------------------------------- -# +# ------------ HARDWARECLOCK= TIMEZONE= KEYMAP= @@ -17,25 +15,17 @@ LOCALE= DAEMON_LOCALE="yes" USECOLOR="yes" -# ----------------------------------------------------------------------- # HARDWARE -# ----------------------------------------------------------------------- -# +# -------- MODULES=() - UDEV_TIMEOUT=30 - USEDMRAID="no" - USEBTRFS="no" - USELVM="no" -# ----------------------------------------------------------------------- # NETWORKING -# ----------------------------------------------------------------------- -# -HOSTNAME="myhost" +# ---------- +HOSTNAME= interface= address= @@ -45,8 +35,7 @@ gateway= NETWORK_PERSIST="no" -# ----------------------------------------------------------------------- # DAEMONS -# ----------------------------------------------------------------------- +# ------- # DAEMONS=(syslog-ng network crond) diff --git a/rc.conf.5.txt b/rc.conf.5.txt index bb26c5c..9ec8526 100644 --- a/rc.conf.5.txt +++ b/rc.conf.5.txt @@ -137,7 +137,7 @@ NETWORKING[[N]] Hostname of machine. Should also be put in /etc/hosts. The contents of /etc/hostname (if not empty) takes precedence. -Default: "myhost" +Default: empty The following settings help you setting up a wired network. |