From c140bde91de73afe8257827813f0b823d2dd7a86 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 7 Dec 2015 11:36:07 +0100 Subject: [PATCH] Current state --- .etckeeper | 2 +- config-archive/etc/rc.conf | 20 +-- config-archive/etc/rc.conf.1 | 10 +- config-archive/etc/rc.conf.2 | 61 ++++++++- config-archive/etc/rc.conf.3 | 2 +- config-archive/etc/rc.conf.4 | 22 +++- .../etc/rc.conf.5 | 124 +++--------------- config-archive/etc/rc.conf.dist | 9 ++ rc.conf | 9 ++ 9 files changed, 135 insertions(+), 124 deletions(-) rename ._cfg0000_rc.conf => config-archive/etc/rc.conf.5 (55%) diff --git a/.etckeeper b/.etckeeper index 5c7977d..a41edfe 100755 --- a/.etckeeper +++ b/.etckeeper @@ -34,7 +34,6 @@ mkdir -p './texmf/dvips.d' mkdir -p './udev/hwdb.d' mkdir -p './unixODBC/ODBCDataSources' maybe chmod 0755 '.' -maybe chmod 0644 '._cfg0000_rc.conf' maybe chmod 0700 '.etckeeper' maybe chmod 0644 '.gitignore' maybe chmod 0644 'DIR_COLORS' @@ -627,6 +626,7 @@ maybe chmod 0644 'config-archive/etc/rc.conf.1' maybe chmod 0644 'config-archive/etc/rc.conf.2' maybe chmod 0644 'config-archive/etc/rc.conf.3' maybe chmod 0644 'config-archive/etc/rc.conf.4' +maybe chmod 0644 'config-archive/etc/rc.conf.5' maybe chmod 0644 'config-archive/etc/rc.conf.dist' maybe chmod 0644 'config-archive/etc/request-key.conf' maybe chmod 0644 'config-archive/etc/request-key.conf.dist' diff --git a/config-archive/etc/rc.conf b/config-archive/etc/rc.conf index f8f9900..f43ecc9 100644 --- a/config-archive/etc/rc.conf +++ b/config-archive/etc/rc.conf @@ -118,6 +118,9 @@ unicode="YES" #SSD_NICELEVEL="-19" # Pass ulimit parameters +# If you are using bash in POSIX mode for your shell, note that the +# ulimit command uses a block size of 512 bytes for the -c and -f +# options #rc_ulimit="-u 30" # It's possible to define extra dependencies for services like so @@ -149,14 +152,15 @@ unicode="YES" # LINUX SPECIFIC OPTIONS # This is the subsystem type. Valid options on Linux: -# "" - nothing special -# "lxc" - Linux Containers -# "openvz" - Linux OpenVZ -# "prefix" - Prefix -# "uml" - Usermode Linux -# "vserver" - Linux vserver -# "xen0" - Xen0 Domain -# "xenU" - XenU Domain +# "" - nothing special +# "lxc" - Linux Containers +# "openvz" - Linux OpenVZ +# "prefix" - Prefix +# "uml" - Usermode Linux +# "vserver" - Linux vserver +# "systemd-nspawn" - Container created by the systemd-nspawn utility +# "xen0" - Xen0 Domain +# "xenU" - XenU Domain # If this is commented out, automatic detection will be used. # # This should be set to the value representing the environment this file is diff --git a/config-archive/etc/rc.conf.1 b/config-archive/etc/rc.conf.1 index f150285..f8f9900 100644 --- a/config-archive/etc/rc.conf.1 +++ b/config-archive/etc/rc.conf.1 @@ -53,6 +53,10 @@ rc_logger="YES" # The default value is: /var/log/rc.log rc_log_path="/var/log/rc.log" +# If you want verbose output for OpenRC, set this to yes. If you want +# verbose output for service foo only, set it to yes in /etc/conf.d/foo. +#rc_verbose=no + # By default we filter the environment for our running scripts. To allow other # variables through, add them here. Use a * to allow all variables through. #rc_env_allow="VAR1 VAR2" @@ -75,6 +79,10 @@ rc_log_path="/var/log/rc.log" #rc_crashed_stop=NO #rc_crashed_start=YES +# Set rc_nocolor to yes if you do not want colors displayed in OpenRC +# output. +#rc_nocolor=NO + ############################################################################## # MISC CONFIGURATION VARIABLES # There variables are shared between many init scripts @@ -88,7 +96,7 @@ unicode="YES" # Below is the default list of network fstypes. # -# afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs +# afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs # nfs nfs4 ocfs2 shfs smbfs # # If you would like to add to this list, you can do so by adding your diff --git a/config-archive/etc/rc.conf.2 b/config-archive/etc/rc.conf.2 index 388d2e4..f150285 100644 --- a/config-archive/etc/rc.conf.2 +++ b/config-archive/etc/rc.conf.2 @@ -82,6 +82,10 @@ rc_log_path="/var/log/rc.log" # Set unicode to YES to turn on unicode support for keyboards and screens. unicode="YES" +# This is how long fuser should wait for a remote server to respond. The +# default is 60 seconds, but it can be adjusted here. +#rc_fuser_timeout=60 + # Below is the default list of network fstypes. # # afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs @@ -103,7 +107,7 @@ unicode="YES" # Some daemons are started and stopped via start-stop-daemon. # We can set some things on a per service basis, like the nicelevel. -#export SSD_NICELEVEL="-19" +#SSD_NICELEVEL="-19" # Pass ulimit parameters #rc_ulimit="-u 30" @@ -155,10 +159,59 @@ rc_sys="" # consolefont, numlock, etc ...) rc_tty_number=12 +############################################################################## +# CGROUPS RESOURCE MANAGEMENT + # If you have cgroups turned on in your kernel, this switch controls # whether or not a group for each controller is mounted under # /sys/fs/cgroup. -# Support for process management by cgroups is planned in the future, -# so if you turn this off, be aware that you may not be able to use that -# feature. +# None of the other options in this section work if this is set to "NO". #rc_controller_cgroups="YES" + +# The following settings allow you to set up values for the cgroup +# controllers for your services. +# They can be set in this file;, however, if you do this, the settings +# will apply to all of your services. +# If you want different settings for each service, place the settings in +# /etc/conf.d/foo for service foo. +# The format is to specify the names of the settings followed by their +# values. Each variable can hold multiple settings. +# For example, you would use this to set the cpu.shares setting in the +# cpu controller to 512 for your service. +# rc_cgroup_cpu=" +# cpu.shares 512 +# " +# +#For more information about the adjustments that can be made with +#cgroups, see Documentation/cgroups/* in the linux kernel source tree. + +# Set the blkio controller settings for this service. +#rc_cgroup_blkio="" + +# Set the cpu controller settings for this service. +#rc_cgroup_cpu="" + +# Add this service to the cpuacct controller (any value means yes). +#rc_cgroup_cpuacct="" + +# Set the cpuset controller settings for this service. +#rc_cgroup_cpuset="" + +# Set the devices controller settings for this service. +#rc_cgroup_devices="" + +# Set the memory controller settings for this service. +#rc_cgroup_memory="" + +# Set the net_prio controller settings for this service. +#rc_cgroup_net_prio="" + +# Set this to YES if yu want all of the processes in a service's cgroup +# killed when the service is stopped or restarted. +# This should not be set globally because it kills all of the service's +# child processes, and most of the time this is undesirable. Please set +# it in /etc/conf.d/. +# To perform this cleanup manually for a stopped service, you can +# execute cgroup_cleanup with /etc/init.d/ cgroup_cleanup or +# rc-service cgroup_cleanup. +# rc_cgroup_cleanup="NO" diff --git a/config-archive/etc/rc.conf.3 b/config-archive/etc/rc.conf.3 index 722c40a..388d2e4 100644 --- a/config-archive/etc/rc.conf.3 +++ b/config-archive/etc/rc.conf.3 @@ -156,7 +156,7 @@ rc_sys="" rc_tty_number=12 # If you have cgroups turned on in your kernel, this switch controls -# whether or not a group for each controler is mounted under +# whether or not a group for each controller is mounted under # /sys/fs/cgroup. # Support for process management by cgroups is planned in the future, # so if you turn this off, be aware that you may not be able to use that diff --git a/config-archive/etc/rc.conf.4 b/config-archive/etc/rc.conf.4 index 9d8afee..722c40a 100644 --- a/config-archive/etc/rc.conf.4 +++ b/config-archive/etc/rc.conf.4 @@ -96,6 +96,10 @@ unicode="YES" # These variables are documented here, but should be configured in # /etc/conf.d/foo for service foo and NOT enabled here unless you # really want them to work on a global basis. +# If your service has characters in its name which are not legal in +# shell variable names and you configure the variables for it in this +# file, those characters should be replaced with underscores in the +# variable names as shown below. # Some daemons are started and stopped via start-stop-daemon. # We can set some things on a per service basis, like the nicelevel. @@ -118,6 +122,13 @@ unicode="YES" #rc_foo_need="openvpn" #rc_foo_after="clock" +# Below is an example for service foo-bar. Note that the '-' is illegal +# in a shell variable name, so we convert it to an underscore. +# example for service foo-bar. +#rc_foo_bar_config="/etc/foo-bar" +#rc_foo_bar_need="openvpn" +#rc_foo_bar_after="clock" + # You can also remove dependencies. # This is mainly used for saying which servies do NOT provide net. #rc_net_tap0_provide="!net" @@ -134,9 +145,7 @@ unicode="YES" # "vserver" - Linux vserver # "xen0" - Xen0 Domain # "xenU" - XenU Domain -# If this is commented out, automatic detection will be attempted. -# Note that autodetection will not work in a prefix environment or in a -# linux container. +# If this is commented out, automatic detection will be used. # # This should be set to the value representing the environment this file is # PRESENTLY in, not the virtualization the environment is capable of. @@ -146,3 +155,10 @@ rc_sys="" # consolefont, numlock, etc ...) rc_tty_number=12 +# If you have cgroups turned on in your kernel, this switch controls +# whether or not a group for each controler is mounted under +# /sys/fs/cgroup. +# Support for process management by cgroups is planned in the future, +# so if you turn this off, be aware that you may not be able to use that +# feature. +#rc_controller_cgroups="YES" diff --git a/._cfg0000_rc.conf b/config-archive/etc/rc.conf.5 similarity index 55% rename from ._cfg0000_rc.conf rename to config-archive/etc/rc.conf.5 index 8eb5286..9d8afee 100644 --- a/._cfg0000_rc.conf +++ b/config-archive/etc/rc.conf.5 @@ -8,12 +8,14 @@ # the boot process. Don't file bugs about this unless you can supply # patches that fix it without breaking other things! #rc_parallel="NO" +rc_parallel="YES" # Set rc_interactive to "YES" and you'll be able to press the I key during # boot so you can choose to start specific services. Set to "NO" to disable # this feature. This feature is automatically disabled if rc_parallel is # set to YES. #rc_interactive="YES" +rc_interactive="YES" # If we need to drop to a shell, you can specify it here. # If not specified we use $SHELL, otherwise the one specified in /etc/passwd, @@ -45,15 +47,11 @@ rc_shell=/sbin/sulogin # /var/log/rc.log # NOTE: Linux systems require the devfs service to be started before # logging can take place and as such cannot log the sysinit runlevel. -#rc_logger="YES" +rc_logger="YES" # Through rc_log_path you can specify a custom log file. # The default value is: /var/log/rc.log -#rc_log_path="/var/log/rc.log" - -# If you want verbose output for OpenRC, set this to yes. If you want -# verbose output for service foo only, set it to yes in /etc/conf.d/foo. -#rc_verbose=no +rc_log_path="/var/log/rc.log" # By default we filter the environment for our running scripts. To allow other # variables through, add them here. Use a * to allow all variables through. @@ -77,10 +75,6 @@ rc_shell=/sbin/sulogin #rc_crashed_stop=NO #rc_crashed_start=YES -# Set rc_nocolor to yes if you do not want colors displayed in OpenRC -# output. -#rc_nocolor=NO - ############################################################################## # MISC CONFIGURATION VARIABLES # There variables are shared between many init scripts @@ -88,13 +82,9 @@ rc_shell=/sbin/sulogin # Set unicode to YES to turn on unicode support for keyboards and screens. unicode="YES" -# This is how long fuser should wait for a remote server to respond. The -# default is 60 seconds, but it can be adjusted here. -#rc_fuser_timeout=60 - # Below is the default list of network fstypes. # -# afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs +# afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs # nfs nfs4 ocfs2 shfs smbfs # # If you would like to add to this list, you can do so by adding your @@ -106,19 +96,12 @@ unicode="YES" # These variables are documented here, but should be configured in # /etc/conf.d/foo for service foo and NOT enabled here unless you # really want them to work on a global basis. -# If your service has characters in its name which are not legal in -# shell variable names and you configure the variables for it in this -# file, those characters should be replaced with underscores in the -# variable names as shown below. # Some daemons are started and stopped via start-stop-daemon. # We can set some things on a per service basis, like the nicelevel. -#SSD_NICELEVEL="-19" +#export SSD_NICELEVEL="-19" # Pass ulimit parameters -# If you are using bash in POSIX mode for your shell, note that the -# ulimit command uses a block size of 512 bytes for the -c and -f -# options #rc_ulimit="-u 30" # It's possible to define extra dependencies for services like so @@ -135,13 +118,6 @@ unicode="YES" #rc_foo_need="openvpn" #rc_foo_after="clock" -# Below is an example for service foo-bar. Note that the '-' is illegal -# in a shell variable name, so we convert it to an underscore. -# example for service foo-bar. -#rc_foo_bar_config="/etc/foo-bar" -#rc_foo_bar_need="openvpn" -#rc_foo_bar_after="clock" - # You can also remove dependencies. # This is mainly used for saying which servies do NOT provide net. #rc_net_tap0_provide="!net" @@ -150,87 +126,23 @@ unicode="YES" # LINUX SPECIFIC OPTIONS # This is the subsystem type. Valid options on Linux: -# "" - nothing special -# "lxc" - Linux Containers -# "openvz" - Linux OpenVZ -# "prefix" - Prefix -# "uml" - Usermode Linux -# "vserver" - Linux vserver -# "systemd-nspawn" - Container created by the systemd-nspawn utility -# "xen0" - Xen0 Domain -# "xenU" - XenU Domain -# If this is commented out, automatic detection will be used. +# "" - nothing special +# "lxc" - Linux Containers +# "openvz" - Linux OpenVZ +# "prefix" - Prefix +# "uml" - Usermode Linux +# "vserver" - Linux vserver +# "xen0" - Xen0 Domain +# "xenU" - XenU Domain +# If this is commented out, automatic detection will be attempted. +# Note that autodetection will not work in a prefix environment or in a +# linux container. # # This should be set to the value representing the environment this file is # PRESENTLY in, not the virtualization the environment is capable of. -#rc_sys="" +rc_sys="" # This is the number of tty's used in most of the rc-scripts (like # consolefont, numlock, etc ...) rc_tty_number=12 -############################################################################## -# CGROUPS RESOURCE MANAGEMENT - -# If you have cgroups turned on in your kernel, this switch controls -# whether or not a group for each controller is mounted under -# /sys/fs/cgroup. -# None of the other options in this section work if this is set to "NO". -#rc_controller_cgroups="YES" - -# The following settings allow you to set up values for the cgroup -# controllers for your services. -# They can be set in this file;, however, if you do this, the settings -# will apply to all of your services. -# If you want different settings for each service, place the settings in -# /etc/conf.d/foo for service foo. -# The format is to specify the names of the settings followed by their -# values. Each variable can hold multiple settings. -# For example, you would use this to set the cpu.shares setting in the -# cpu controller to 512 for your service. -# rc_cgroup_cpu=" -# cpu.shares 512 -# " -# -#For more information about the adjustments that can be made with -#cgroups, see Documentation/cgroups/* in the linux kernel source tree. - -# Set the blkio controller settings for this service. -#rc_cgroup_blkio="" - -# Set the cpu controller settings for this service. -#rc_cgroup_cpu="" - -# Add this service to the cpuacct controller (any value means yes). -#rc_cgroup_cpuacct="" - -# Set the cpuset controller settings for this service. -#rc_cgroup_cpuset="" - -# Set the devices controller settings for this service. -#rc_cgroup_devices="" - -# Set the hugetlb controller settings for this service. -#rc_cgroup_hugetlb="" - -# Set the memory controller settings for this service. -#rc_cgroup_memory="" - -# Set the net_cls controller settings for this service. -#rc_cgroup_net_cls="" - -# Set the net_prio controller settings for this service. -#rc_cgroup_net_prio="" - -# Set the pids controller settings for this service. -#rc_cgroup_pids="" - -# Set this to YES if yu want all of the processes in a service's cgroup -# killed when the service is stopped or restarted. -# This should not be set globally because it kills all of the service's -# child processes, and most of the time this is undesirable. Please set -# it in /etc/conf.d/. -# To perform this cleanup manually for a stopped service, you can -# execute cgroup_cleanup with /etc/init.d/ cgroup_cleanup or -# rc-service cgroup_cleanup. -# rc_cgroup_cleanup="NO" diff --git a/config-archive/etc/rc.conf.dist b/config-archive/etc/rc.conf.dist index 5cef074..8eb5286 100644 --- a/config-archive/etc/rc.conf.dist +++ b/config-archive/etc/rc.conf.dist @@ -210,12 +210,21 @@ rc_tty_number=12 # Set the devices controller settings for this service. #rc_cgroup_devices="" +# Set the hugetlb controller settings for this service. +#rc_cgroup_hugetlb="" + # Set the memory controller settings for this service. #rc_cgroup_memory="" +# Set the net_cls controller settings for this service. +#rc_cgroup_net_cls="" + # Set the net_prio controller settings for this service. #rc_cgroup_net_prio="" +# Set the pids controller settings for this service. +#rc_cgroup_pids="" + # Set this to YES if yu want all of the processes in a service's cgroup # killed when the service is stopped or restarted. # This should not be set globally because it kills all of the service's diff --git a/rc.conf b/rc.conf index f43ecc9..427701d 100644 --- a/rc.conf +++ b/rc.conf @@ -212,12 +212,21 @@ rc_tty_number=12 # Set the devices controller settings for this service. #rc_cgroup_devices="" +# Set the hugetlb controller settings for this service. +#rc_cgroup_hugetlb="" + # Set the memory controller settings for this service. #rc_cgroup_memory="" +# Set the net_cls controller settings for this service. +#rc_cgroup_net_cls="" + # Set the net_prio controller settings for this service. #rc_cgroup_net_prio="" +# Set the pids controller settings for this service. +#rc_cgroup_pids="" + # Set this to YES if yu want all of the processes in a service's cgroup # killed when the service is stopped or restarted. # This should not be set globally because it kills all of the service's -- 2.39.5