Removing unneeded entries from etc/conf.d/rc and etc/rc.conf

svn path=/baselayout-vserver/trunk/; revision=10

2 files changed, 0 insertions, 98 deletions

diff --git a/etc/conf.d/rc b/etc/conf.d/rc
index b0b6167..bbba288 100644
--- a/etc/conf.d/rc
+++ b/etc/conf.d/rc
@@ -1,58 +1,10 @@
 # /etc/conf.d/rc: Global config file for the Gentoo RC System
 
-# This is the number of tty's used in most of the rc-scripts (like
-# consolefont, numlock, etc ...)
-
-RC_TTY_NUMBER=11
-
 # Set to "yes" if you want the rc system to try and start services
 # in parallel for a slight speed improvement.
 
 RC_PARALLEL_STARTUP="no"
 
-# RC_NET_STRICT_CHECKING allows some flexibility with the 'net' service.
-# The following values are allowed:
-#  none  - The 'net' service is always considered up.
-#  no    - This basically means that at least one net.* service besides net.lo
-#          must be up.  This can be used by notebook users that have a wifi and
-#          a static nic, and only wants one up at any given time to have the
-#          'net' service seen as up.
-#  lo    - This is the same as the 'no' option, but net.lo is also counted.
-#          This should be useful to people that do not care about any specific
-#          interface being up at boot.
-#  yes   - For this ALL network interfaces MUST be up for the 'net' service to
-#          be considered up.
-
-RC_NET_STRICT_CHECKING="no"
-
-# 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_VOLUME_ORDER allows you to specify, or even remove the volume setup
-# for various volume managers (MD, EVMS2, LVM, DM, etc).  Note that they are
-# stopped in reverse order.
-
-RC_VOLUME_ORDER="raid evms lvm dm"
-
-# RC_BOOTLOG will generate a log of the boot messages shown on the console.  
-# Useful for headless machines or debugging.  You need to emerge the 
-# app-admin/showconsole package for this to work.
-
-RC_BOOTLOG="no"
-
-# RC_USE_FSTAB allows you to override the default mount options for the 
-# standard /proc, /sys, /dev, and /dev/pts mount points.  Note that this 
-# is the new way for selecting ramfs/tmpfs/etc... for udev mounting.
-
-RC_USE_FSTAB="no"
-
 # RC_USE_CONFIG_PROFILE allows you to have different /etc/conf.d files 
 # based on your runlevel - if a conf.d file for your profile does not exist
 # then we try and use the default one.
@@ -67,31 +19,6 @@ RC_USE_FSTAB="no"
 
 RC_USE_CONFIG_PROFILE="yes"
 
-# RC_FORCE_AUTO tries its best to prevent user interaction during the boot and 
-# shutdown process.  For example, fsck will automatically be run or volumes 
-# remounted to create proper directory trees.  This feature can be dangerous 
-# and is meant ONLY for headless machines where getting a physical console 
-# hooked up is a huge pita.
-
-RC_FORCE_AUTO="no"
-
-# Use this variable to control the /dev management behavior.
-#  auto   - let the scripts figure out what's best at boot
-#  devfs  - use devfs (requires sys-fs/devfsd)
-#  udev   - use udev (requires sys-fs/udev)
-#  static - let the user manage /dev
-
-RC_DEVICES="auto"
-
-# UDEV OPTION:
-# Set to "yes" if you want to save /dev to a tarball on shutdown
-# and restore it on startup.  This is useful if you have a lot of
-# custom device nodes that udev does not handle/know about.
-
-RC_DEVICE_TARBALL="no"
-
-
-
 #
 # Controlling start-stop-daemon behavior
 
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"