summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2005-12-03 12:49:13 +0000
committerBenedikt Boehm <hollow@gentoo.org>2005-12-03 12:49:13 +0000
commit49f48c44cc76bc422a3b807040fba15997ff3177 (patch)
tree0bf06f2950e3cab3703555342034f7e703c6004d
parentimport tarball.sh script (diff)
downloadbaselayout-vserver-49f48c44cc76bc422a3b807040fba15997ff3177.tar.gz
baselayout-vserver-49f48c44cc76bc422a3b807040fba15997ff3177.tar.bz2
baselayout-vserver-49f48c44cc76bc422a3b807040fba15997ff3177.zip
fix rc conf
svn path=/baselayout-vserver/branches/baselayout-1_12/; revision=152
-rw-r--r--etc/conf.d/rc10
-rw-r--r--etc/rc.conf25
2 files changed, 0 insertions, 35 deletions
diff --git a/etc/conf.d/rc b/etc/conf.d/rc
index 3387538..325bd60 100644
--- a/etc/conf.d/rc
+++ b/etc/conf.d/rc
@@ -25,16 +25,6 @@ RC_PARALLEL_STARTUP="no"
RC_NET_STRICT_CHECKING="none"
-# RC_AUTO_INTERFACE allows us to try and configure your interfaces
-# automatically. This includes:
-# - link /etc/{resolv,ntp,yp}.conf to /var/lib/net-scripts
-# - calculate a metric based on what interfaces are up and type
-# - apply interface state (resolv.conf, ntp.conf, etc)
-# - merge resolv.conf and ntp.conf from active interfaces based on metric
-# otherwise we don't do the above
-
-RC_AUTO_INTERFACE="no"
-
# RC_VERBOSE will make init scripts more verbose. Only networking scripts
# really use this at this time, and this is useful for trouble shooting
# any issues you may have.
diff --git a/etc/rc.conf b/etc/rc.conf
index b1c90e5..3be0f86 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -12,28 +12,3 @@ UNICODE="no"
EDITOR="/bin/nano"
#EDITOR="/usr/bin/vim"
#EDITOR="/usr/bin/emacs"
-
-# What display manager do you use ? [ xdm | gdm | kdm | entrance ]
-#DISPLAYMANAGER="xdm"
-
-# XSESSION is a new variable to control what window manager to start
-# default with X if run with xdm, startx or xinit. The default behavior
-# is to look in /etc/X11/Sessions/ and run the script in matching the
-# value that XSESSION is set to. The support scripts are smart enough to
-# look in all bin directories if it cant find a match in /etc/X11/Sessions/,
-# so setting it to "enlightenment" can also work. This is basically used
-# as a way for the system admin to configure a default system wide WM,
-# allthough it will work if the user export XSESSION in his .bash_profile, etc.
-#
-# NOTE: 1) this behaviour is overridden when a ~/.xinitrc exists, and startx
-# is called.
-# 2) even if ~/.xsession exists, if XSESSION can be resolved, it will
-# be executed rather than ~/.xsession, else KDM breaks ...
-#
-# Defaults depending on what you install currently include:
-#
-# Gnome - will start gnome-session
-# kde-<version> - will start startkde (ex: kde-3.0.2)
-# Xsession - will start a terminal and a few other nice apps
-
-#XSESSION="Gnome"