From 8d58138377082f5ad7b71f070726c2ea09c6a7aa Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 2 Feb 2015 15:58:23 +0100 Subject: [PATCH] Current state --- .etckeeper | 8 +- ImageMagick-6/delegates.xml | 4 +- ImageMagick-6/policy.xml | 8 +- ImageMagick-6/type.xml | 2 +- bind/named-acl.conf | 17 +- conf.d/devfs | 8 + conf.d/hwclock | 4 +- conf.d/keymaps | 2 +- config-archive/etc/conf.d/keymaps | 2 +- config-archive/etc/conf.d/keymaps.1 | 23 ++ config-archive/etc/conf.d/keymaps.dist | 2 +- config-archive/etc/rc.conf | 61 ++++- config-archive/etc/rc.conf.1 | 2 +- config-archive/etc/rc.conf.2 | 22 +- config-archive/etc/rc.conf.3 | 148 ++++++++++++ config-archive/etc/rc.conf.dist | 10 +- init.d/bootmisc | 12 +- init.d/consolefont | 2 +- init.d/devfs | 97 +++++++- init.d/dmesg | 2 +- init.d/fsck | 2 +- init.d/hostname | 2 +- init.d/hwclock | 19 +- init.d/keymaps | 2 +- init.d/killprocs | 2 +- init.d/local | 69 ++++-- init.d/localmount | 29 ++- init.d/loopback | 4 +- init.d/modules | 2 +- init.d/mount-ro | 4 +- init.d/netmount | 30 +-- init.d/numlock | 2 +- init.d/procfs | 6 +- init.d/root | 2 +- init.d/savecache | 6 +- init.d/swap | 2 +- init.d/swapfiles | 2 +- init.d/swclock | 4 +- init.d/sysctl | 26 +-- init.d/sysfs | 48 ++-- init.d/termencoding | 2 +- init.d/tmpfiles.dev | 5 +- init.d/tmpfiles.setup | 4 +- init.d/udev | 78 ++++--- init.d/udev-mount | 81 ------- init.d/urandom | 2 +- .../{busybox-1.21.0 => busybox-1.23.0} | 214 ++++++++++-------- rc.conf | 10 +- resolv.conf | 2 +- texmf/ls-R | 4 +- xml/catalog | 2 +- 51 files changed, 715 insertions(+), 388 deletions(-) create mode 100644 conf.d/devfs create mode 100644 config-archive/etc/conf.d/keymaps.1 create mode 100644 config-archive/etc/rc.conf.3 delete mode 100755 init.d/udev-mount rename portage/savedconfig/sys-apps/{busybox-1.21.0 => busybox-1.23.0} (88%) diff --git a/.etckeeper b/.etckeeper index d86c434..122b1d6 100755 --- a/.etckeeper +++ b/.etckeeper @@ -6,6 +6,7 @@ mkdir -p './courier-imap/shared.tmp' mkdir -p './dpkg/dpkg.cfg.d' mkdir -p './fail2ban/fail2ban.d' mkdir -p './gtk-2.0/x86_64-pc-linux-gnu' +mkdir -p './lvm/cache' mkdir -p './pango/x86_64-pc-linux-gnu' mkdir -p './salt/pki/minions_pre' mkdir -p './salt/pki/minions_rejected' @@ -155,6 +156,7 @@ maybe chmod 0644 'conf.d/busybox-watchdog' maybe chmod 0644 'conf.d/clamd' maybe chmod 0644 'conf.d/consolefont' maybe chmod 0644 'conf.d/crypto-loop' +maybe chmod 0644 'conf.d/devfs' maybe chmod 0644 'conf.d/device-mapper' maybe chmod 0644 'conf.d/dmesg' maybe chmod 0644 'conf.d/fail2ban' @@ -261,6 +263,7 @@ maybe chmod 0644 'config-archive/etc/conf.d/apache2.dist' maybe chmod 0644 'config-archive/etc/conf.d/fsck' maybe chmod 0644 'config-archive/etc/conf.d/fsck.dist' maybe chmod 0644 'config-archive/etc/conf.d/keymaps' +maybe chmod 0644 'config-archive/etc/conf.d/keymaps.1' maybe chmod 0644 'config-archive/etc/conf.d/keymaps.dist' maybe chmod 0644 'config-archive/etc/conf.d/named' maybe chmod 0644 'config-archive/etc/conf.d/named.dist' @@ -571,6 +574,7 @@ maybe chmod 0644 'config-archive/etc/profile.dist' maybe chmod 0644 'config-archive/etc/rc.conf' 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.dist' maybe chmod 0644 'config-archive/etc/request-key.conf' maybe chmod 0644 'config-archive/etc/request-key.conf.dist' @@ -1180,7 +1184,6 @@ maybe chmod 0755 'init.d/termencoding' maybe chmod 0755 'init.d/tmpfiles.dev' maybe chmod 0755 'init.d/tmpfiles.setup' maybe chmod 0755 'init.d/udev' -maybe chmod 0755 'init.d/udev-mount' maybe chmod 0755 'init.d/ulogd' maybe chmod 0755 'init.d/urandom' maybe chmod 0755 'init.d/vixie-cron' @@ -1264,7 +1267,6 @@ maybe chmod 0600 'lvm/archive/vg00_00001-682332803.vg' maybe chmod 0700 'lvm/backup' maybe chmod 0600 'lvm/backup/vg00' maybe chmod 0700 'lvm/cache' -maybe chmod 0600 'lvm/cache/.cache' maybe chmod 0644 'lvm/lvm.conf' maybe chmod 0755 'lvm/profile' maybe chmod 0444 'lvm/profile/command_profile_template.profile' @@ -1556,7 +1558,7 @@ maybe chmod 0755 'portage/repos.conf' maybe chmod 0644 'portage/repos.conf/gentoo.conf' maybe chmod 0755 'portage/savedconfig' maybe chmod 0755 'portage/savedconfig/sys-apps' -maybe chmod 0644 'portage/savedconfig/sys-apps/busybox-1.21.0' +maybe chmod 0644 'portage/savedconfig/sys-apps/busybox-1.23.0' maybe chmod 0755 'postfix' maybe chmod 0644 'postfix/.gitignore' maybe chmod 0644 'postfix/.keep_mail-mta_postfix-0' diff --git a/ImageMagick-6/delegates.xml b/ImageMagick-6/delegates.xml index 855352e..f838a0e 100644 --- a/ImageMagick-6/delegates.xml +++ b/ImageMagick-6/delegates.xml @@ -69,6 +69,8 @@ --> + + @@ -121,7 +123,7 @@ - + diff --git a/ImageMagick-6/policy.xml b/ImageMagick-6/policy.xml index e4908b1..16e2790 100644 --- a/ImageMagick-6/policy.xml +++ b/ImageMagick-6/policy.xml @@ -39,15 +39,17 @@ - Define arguments for the memory, map, area, and disk resources with - SI prefixes (.e.g 100MB). In addition, resource policies are maximums for - each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB + Define arguments for the memory, map, area, width, height, and disk resources + with SI prefixes (.e.g 100MB). In addition, resource policies are maximums + for each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB exceeds policy maximum so memory limit is 1GB). --> + + diff --git a/ImageMagick-6/type.xml b/ImageMagick-6/type.xml index 9197be4..6a8ee9d 100644 --- a/ImageMagick-6/type.xml +++ b/ImageMagick-6/type.xml @@ -17,5 +17,5 @@ ]> - + diff --git a/bind/named-acl.conf b/bind/named-acl.conf index de512c8..cde07e0 100644 --- a/bind/named-acl.conf +++ b/bind/named-acl.conf @@ -16,18 +16,21 @@ acl common-allow-transfer { 213.20.92.7; - 80.154.16.7; - 85.199.64.7; - 46.16.73.175; + 80.154.16.7; // ns2.boreus.de (alt) + 85.199.64.7; // ns3.boreus.de + 195.50.185.7; // ns1.boreus.de + 46.189.56.7; // ns2.boreus.de + 46.16.73.175; // uhu1 85.214.43.33; - 85.214.134.152; - 85.214.147.150; - 195.50.185.7; + 85.214.134.152; // helga + 85.214.147.150; // leela + 144.76.221.169; // maria.acwain.net 2a01:238:4239:8a00:d4da:215d:3d01:f9b9; 127.0.0.1; ::1; 85.214.134.152; - 2a01:238:4225:6e00:8f8c:808a:7fb8:88df; + 2a01:238:4225:6e00:8f8c:808a:7fb8:88df; // helga + 2a01:4f8:200:94a8::2; // maria.acwain.net 2001:6f8:1db7::1; 2001:6f8:1c00:365::2; }; diff --git a/conf.d/devfs b/conf.d/devfs new file mode 100644 index 0000000..51f8037 --- /dev/null +++ b/conf.d/devfs @@ -0,0 +1,8 @@ +# OpenRC will attempt each of the following in succession to mount /dev. +# +# 1. If there is an entry for /dev in fstab, it will be used. +# 2. If devtmpfs is defined in the kernel, it will be used. +# 3. If tmpfs is defined in the kernel, it will be used. +# +# Set this to yes if you do not want OpenRC to attempt to mount /dev. +# skip_mount_dev="NO" diff --git a/conf.d/hwclock b/conf.d/hwclock index 59bb732..ce9b40a 100644 --- a/conf.d/hwclock +++ b/conf.d/hwclock @@ -7,8 +7,8 @@ clock="UTC" # If you want the hwclock script to set the system time (software clock) # to match the current hardware clock during bootup, leave this # commented out. -# However, you can set this to "NO" ifyou are running a modern kernel -# with CONFIG_RTC_HCTOSYS set to y and your hardware clock set to UTC. +# However, you can set this to "NO" if you are running a modern kernel +# and using NTP to synchronize your system clock. #clock_hctosys="YES" # If you do not want to set the hardware clock to the current system diff --git a/conf.d/keymaps b/conf.d/keymaps index ee4298e..7bf981e 100644 --- a/conf.d/keymaps +++ b/conf.d/keymaps @@ -18,6 +18,6 @@ extended_keymaps="" # For a list of valid sets, run `dumpkeys --help` dumpkeys_charset="" -# Some fonts map AltGr-E to the currency symbol ¤ instead of the Euro € +# Some fonts map AltGr-E to the currency symbol instead of the Euro. # To fix this, set to "yes" fix_euro="NO" diff --git a/config-archive/etc/conf.d/keymaps b/config-archive/etc/conf.d/keymaps index 9b84390..ee4298e 100644 --- a/config-archive/etc/conf.d/keymaps +++ b/config-archive/etc/conf.d/keymaps @@ -12,7 +12,7 @@ windowkeys="YES" extended_keymaps="" #extended_keymaps="backspace keypad euro2" -# Tell dumpkeys(1) to interpret character action codes to be +# Tell dumpkeys(1) to interpret character action codes to be # from the specified character set. # This only matters if you set unicode="yes" in /etc/rc.conf. # For a list of valid sets, run `dumpkeys --help` diff --git a/config-archive/etc/conf.d/keymaps.1 b/config-archive/etc/conf.d/keymaps.1 new file mode 100644 index 0000000..9b84390 --- /dev/null +++ b/config-archive/etc/conf.d/keymaps.1 @@ -0,0 +1,23 @@ +# Use keymap to specify the default console keymap. There is a complete tree +# of keymaps in /usr/share/keymaps to choose from. +keymap="de-latin1-nodeadkeys" + +# Should we first load the 'windowkeys' console keymap? Most x86 users will +# say "yes" here. Note that non-x86 users should leave it as "no". +# Loading this keymap will enable VT switching (like ALT+Left/Right) +# using the special windows keys on the linux console. +windowkeys="YES" + +# The maps to load for extended keyboards. Most users will leave this as is. +extended_keymaps="" +#extended_keymaps="backspace keypad euro2" + +# Tell dumpkeys(1) to interpret character action codes to be +# from the specified character set. +# This only matters if you set unicode="yes" in /etc/rc.conf. +# For a list of valid sets, run `dumpkeys --help` +dumpkeys_charset="" + +# Some fonts map AltGr-E to the currency symbol ¤ instead of the Euro € +# To fix this, set to "yes" +fix_euro="NO" diff --git a/config-archive/etc/conf.d/keymaps.dist b/config-archive/etc/conf.d/keymaps.dist index 35d5b89..e454433 100644 --- a/config-archive/etc/conf.d/keymaps.dist +++ b/config-archive/etc/conf.d/keymaps.dist @@ -18,6 +18,6 @@ extended_keymaps="" # For a list of valid sets, run `dumpkeys --help` dumpkeys_charset="" -# Some fonts map AltGr-E to the currency symbol ¤ instead of the Euro € +# Some fonts map AltGr-E to the currency symbol instead of the Euro. # To fix this, set to "yes" fix_euro="NO" diff --git a/config-archive/etc/rc.conf b/config-archive/etc/rc.conf index 388d2e4..f150285 100644 --- a/config-archive/etc/rc.conf +++ b/config-archive/etc/rc.conf @@ -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.1 b/config-archive/etc/rc.conf.1 index 722c40a..388d2e4 100644 --- a/config-archive/etc/rc.conf.1 +++ b/config-archive/etc/rc.conf.1 @@ -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.2 b/config-archive/etc/rc.conf.2 index 9d8afee..722c40a 100644 --- a/config-archive/etc/rc.conf.2 +++ b/config-archive/etc/rc.conf.2 @@ -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/config-archive/etc/rc.conf.3 b/config-archive/etc/rc.conf.3 new file mode 100644 index 0000000..9d8afee --- /dev/null +++ b/config-archive/etc/rc.conf.3 @@ -0,0 +1,148 @@ +# Global OpenRC configuration settings + +# Set to "YES" if you want the rc system to try and start services +# in parallel for a slight speed improvement. When running in parallel we +# prefix the service output with its name as the output will get +# jumbled up. +# WARNING: whilst we have improved parallel, it can still potentially lock +# 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, +# otherwise /bin/sh +# Linux users could specify /sbin/sulogin +rc_shell=/sbin/sulogin + +# Do we allow any started service in the runlevel to satisfy the dependency +# or do we want all of them regardless of state? For example, if net.eth0 +# and net.eth1 are in the default runlevel then with rc_depend_strict="NO" +# both will be started, but services that depend on 'net' will work if either +# one comes up. With rc_depend_strict="YES" we would require them both to +# come up. +#rc_depend_strict="YES" + +# rc_hotplug is a list of services that we allow to be hotplugged. +# By default we do not allow hotplugging. +# A hotplugged service is one started by a dynamic dev manager when a matching +# hardware device is found. +# This service is intrinsically included in the boot runlevel. +# To disable services, prefix with a ! +# Example - rc_hotplug="net.wlan !net.*" +# This allows net.wlan and any service not matching net.* to be plugged. +# Example - rc_hotplug="*" +# This allows all services to be hotplugged +#rc_hotplug="*" + +# rc_logger launches a logging daemon to log the entire rc process to +# /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" + +# 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" + +# 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" + +# By default we assume that all daemons will start correctly. +# However, some do not - a classic example is that they fork and return 0 AND +# then child barfs on a configuration error. Or the daemon has a bug and the +# child crashes. You can set the number of milliseconds start-stop-daemon +# waits to check that the daemon is still running after starting here. +# The default is 0 - no checking. +#rc_start_wait=100 + +# rc_nostop is a list of services which will not stop when changing runlevels. +# This still allows the service itself to be stopped when called directly. +#rc_nostop="" + +# rc will attempt to start crashed services by default. +# However, it will not stop them by default as that could bring down other +# critical services. +#rc_crashed_stop=NO +#rc_crashed_start=YES + +############################################################################## +# MISC CONFIGURATION VARIABLES +# There variables are shared between many init scripts + +# Set unicode to YES to turn on unicode support for keyboards and screens. +unicode="YES" + +# Below is the default list of network fstypes. +# +# 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 +# own fstypes to the following variable. +#extra_net_fs_list="" + +############################################################################## +# SERVICE CONFIGURATION VARIABLES +# 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. + +# 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" + +# Pass ulimit parameters +#rc_ulimit="-u 30" + +# It's possible to define extra dependencies for services like so +#rc_config="/etc/foo" +#rc_need="openvpn" +#rc_use="net.eth0" +#rc_after="clock" +#rc_before="local" +#rc_provide="!net" + +# You can also enable the above commands here for each service. Below is an +# example for service foo. +#rc_foo_config="/etc/foo" +#rc_foo_need="openvpn" +#rc_foo_after="clock" + +# You can also remove dependencies. +# This is mainly used for saying which servies do NOT provide net. +#rc_net_tap0_provide="!net" + +############################################################################## +# 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 +# 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="" + +# This is the number of tty's used in most of the rc-scripts (like +# consolefont, numlock, etc ...) +rc_tty_number=12 + diff --git a/config-archive/etc/rc.conf.dist b/config-archive/etc/rc.conf.dist index ec1c4a4..0970fb9 100644 --- a/config-archive/etc/rc.conf.dist +++ b/config-archive/etc/rc.conf.dist @@ -51,6 +51,10 @@ rc_shell=/sbin/sulogin # 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" @@ -73,6 +77,10 @@ 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 @@ -86,7 +94,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/init.d/bootmisc b/init.d/bootmisc index d77c720..b079817 100755 --- a/init.d/bootmisc +++ b/init.d/bootmisc @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. @@ -6,7 +6,7 @@ depend() { need localmount before logger - after clock sysctl + after clock root sysctl keyword -prefix -timeout } @@ -68,7 +68,7 @@ cleanup_var_run_dir() do # Clean stale sockets if [ -S "$x" ]; then - if type fuser >/dev/null 2>&1; then + if command -v fuser >/dev/null 2>&1; then fuser "$x" >/dev/null 2>&1 || rm -- "$x" else rm -- "$x" @@ -117,7 +117,7 @@ migrate_to_run() clean_run() { - [ "$RC_SYS" = VSERVER ] && return 0 + [ "$RC_SYS" = VSERVER -o "$RC_SYS" = LXC ] && return 0 local dir dir=$(mktemp -d) mount --bind / $dir @@ -129,7 +129,9 @@ clean_run() start() { # Remove any added console dirs - rm -rf "$RC_LIBEXECDIR"/console/* + if checkpath -W "$RC_LIBEXECDIR"; then + rm -rf "$RC_LIBEXECDIR"/console/* + fi local logw=false runw=false extra= # Ensure that our basic dirs exist diff --git a/init.d/consolefont b/init.d/consolefont index 2ef35e7..47bf2a4 100755 --- a/init.d/consolefont +++ b/init.d/consolefont @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/devfs b/init.d/devfs index 4a6a7e8..6edcbe2 100755 --- a/init.d/devfs +++ b/init.d/devfs @@ -1,21 +1,86 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2008 Roy Marples # Released under the 2-clause BSD license. -description="Mount system critical filesystems in /dev." +description="Set up the /dev directory" -depend() { - use dev-mount +depend() +{ + provide dev-mount before dev keyword -prefix -vserver -lxc } -start() { - # Mount required stuff as user may not have then in /etc/fstab +mount_dev() +{ + local action=--mount devfstype msg=Mounting + # Some devices require exec, Bug #92921 + local mountopts="exec,nosuid,mode=0755" + if yesno ${skip_mount_dev:-no} ; then + einfo "/dev will not be mounted due to user request" + return 0 + fi + if mountinfo -q /dev; then + action=--remount + mountopts="remount,$mountopts" + msg=Remounting + fi + if fstabinfo -q /dev; then + ebegin "$msg /dev according to /etc/fstab" + fstabinfo -q $action /dev + eend $? + return 0 + fi + if grep -q devtmpfs /proc/filesystems; then + devfstype=devtmpfs + mountopts="$mountopts,size=10M" + elif grep -q tmpfs /proc/filesystems; then + devfstype=tmpfs + mountopts="$mountopts,size=10M" + fi + if [ -n "$devfstype" ]; then + ebegin "$msg $devfstype on /dev" + mount -n -t $devfstype -o $mountopts dev /dev + eend $? + else + ewarn "This kernel does not have devtmpfs or tmpfs support, and there" + ewarn "is no entry for /dev in fstab." + ewarn "This means /dev will not be mounted." + ewarn "To avoid this message, set CONFIG_DEVTMPFS or CONFIG_TMPFS to y" + ewarn "in your kernel configuration or see /etc/conf.d/devfs" + fi + return 0 +} + +seed_dev() +{ + # Seed /dev with some things that we know we need + + # creating /dev/console, /dev/tty and /dev/tty1 to be able to write + # to $CONSOLE with/without bootsplash before udevd creates it + [ -c /dev/console ] || mknod -m 600 /dev/console c 5 1 + [ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1 + [ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0 + + # udevd will dup its stdin/stdout/stderr to /dev/null + # and we do not want a file which gets buffered in ram + [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3 + + # so udev can add its start-message to dmesg + [ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11 + + # extra symbolic links not provided by default + [ -e /dev/fd ] || ln -snf /proc/self/fd /dev/fd + [ -e /dev/stdin ] || ln -snf /proc/self/fd/0 /dev/stdin + [ -e /dev/stdout ] || ln -snf /proc/self/fd/1 /dev/stdout + [ -e /dev/stderr ] || ln -snf /proc/self/fd/2 /dev/stderr + [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core + + # Mount required directories as user may not have them in /etc/fstab for x in \ "mqueue /dev/mqueue 1777 ,nodev mqueue" \ "devpts /dev/pts 0755 ,gid=5,mode=0620 devpts" \ - "tmpfs /dev/shm 1777 ,nodev shm" \ + "tmpfs /dev/shm 1777 ,nodev,mode=1777 shm" \ ; do set -- $x grep -Eq "[[:space:]]+$1$" /proc/filesystems || continue @@ -34,5 +99,23 @@ start() { eend $? fi done +} + +restorecon_dev() +{ + if [ -x /sbin/restorecon ]; then + ebegin "Restoring SELinux contexts in /dev" + restorecon -rF /dev >/dev/null 2>&1 + eend $? + fi + + return 0 +} + +start() +{ + mount_dev + seed_dev + restorecon_dev return 0 } diff --git a/init.d/dmesg b/init.d/dmesg index a4083d0..98c2c43 100755 --- a/init.d/dmesg +++ b/init.d/dmesg @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2008 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/fsck b/init.d/fsck index c2e883d..0130376 100755 --- a/init.d/fsck +++ b/init.d/fsck @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/hostname b/init.d/hostname index fb6260f..7d2a2d9 100755 --- a/init.d/hostname +++ b/init.d/hostname @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/hwclock b/init.d/hwclock index 651590d..bc6aff9 100755 --- a/init.d/hwclock +++ b/init.d/hwclock @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2008 Roy Marples # Released under the 2-clause BSD license. @@ -83,22 +83,17 @@ start() fi fi + # Always set the kernel's time zone. + _hwclock --systz $utc_cmd $clock_args + : $(( retval += $? )) + if [ -e /etc/adjtime ] && yesno $clock_adjfile; then _hwclock --adjust $utc_cmd : $(( retval += $? )) fi - # If setting UTC, don't bother to run hwclock when first booting - # as that's the default - if [ "$PREVLEVEL" != N -o \ - "$utc_cmd" != --utc -o \ - -n "$clock_args" ]; - then - if yesno ${clock_hctosys:-YES}; then - _hwclock --hctosys $utc_cmd $clock_args - else - _hwclock --systz $utc_cmd $clock_args - fi + if yesno ${clock_hctosys:-YES}; then + _hwclock --hctosys $utc_cmd $clock_args : $(( retval += $? )) fi diff --git a/init.d/keymaps b/init.d/keymaps index 507424b..0cadd7d 100755 --- a/init.d/keymaps +++ b/init.d/keymaps @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2008 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/killprocs b/init.d/killprocs index 5552b97..f07de69 100755 --- a/init.d/killprocs +++ b/init.d/killprocs @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2008 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/local b/init.d/local index 6e4ddbf..c65e01e 100755 --- a/init.d/local +++ b/init.d/local @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2008 Roy Marples # Released under the 2-clause BSD license. @@ -12,40 +12,73 @@ depend() start() { - einfo "Starting local" + ebegin "Starting local" - local file - for file in /etc/local.d/*.start ; do - [ -x "$file" ] && "$file" + local file has_errors=0 retval + eindent + for file in /etc/local.d/*.start; do + if [ -x "${file}" ]; then + vebegin "Executing \"${file}\"" + "${file}" 2>&1 >/dev/null + retval=$? + if [ ${retval} -ne 0 ]; then + has_errors=1 + fi + veend ${retval} "Execution of \"${file}\" failed." + fi done + eoutdent - if type local_start >/dev/null 2>&1; then - ewarn "/etc/conf.d/local should be removed." + if command -v local_start >/dev/null 2>&1; then + ewarn "\"/etc/conf.d/local\" should be removed." ewarn "Please move the code from the local_start function" - ewarn "to scripts with an .start extension" - ewarn "in /etc/local.d" + ewarn "to executable scripts with an .start extension" + ewarn "in \"/etc/local.d\"" local_start fi - eend 0 + eend ${has_errors} + + # We have to end with a zero exit code, because a failed execution + # of an executable /etc/local.d/*.start file shouldn't result in + # marking the local service as failed. Otherwise we are unable to + # execute any executable /etc/local.d/*.stop file, because a failed + # marked service cannot be stopped (and the stop function would + # actually call the executable /etc/local.d/*.stop file(s)). + return 0 } stop() { - einfo "Stopping local" + ebegin "Stopping local" - local file + local file has_errors=0 retval + eindent for file in /etc/local.d/*.stop; do - [ -x "$file" ] && "$file" + if [ -x "${file}" ]; then + vebegin "Executing \"${file}\"" + "${file}" 2>&1 >/dev/null + retval=$? + if [ ${retval} -ne 0 ]; then + has_errors=1 + fi + veend ${retval} "Execution of \"${file}\" failed." + fi done + eoutdent - if type local_start >/dev/null 2>&1; then - ewarn "/etc/conf.d/local should be removed." + if command -v local_stop >/dev/null 2>&1; then + ewarn "\"/etc/conf.d/local\" should be removed." ewarn "Please move the code from the local_stop function" - ewarn "to scripts with an .stop extension" - ewarn "in /etc/local.d" + ewarn "to executable scripts with an .stop extension" + ewarn "in \"/etc/local.d\"" local_stop fi - eend 0 + eend ${has_errors} + + # An executable /etc/local.d/*.stop file which failed with a + # non-zero exit status is not a reason to mark this service + # as failed, therefore we have to end with a zero exit code. + return 0 } diff --git a/init.d/localmount b/init.d/localmount index 7974765..89f4008 100755 --- a/init.d/localmount +++ b/init.d/localmount @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. @@ -59,10 +59,35 @@ stop() no_umounts_r="^($no_umounts_r)$" # Flush all pending disk writes now - sync; sync + sync . "$RC_LIBEXECDIR"/sh/rc-mount.sh + if [ "$RC_UNAME" = Linux ] && [ -d /sys/fs/aufs ] ; then + #if / is aufs we remount it noxino during shutdown + if mountinfo -q -f '^aufs$' / ; then + mount -o remount,noxino,rw / + sync + fi + + local aufs_branch aufs_mount_dir aufs_mount_point aufs_si_dir aufs_si_id + for aufs_si_dir in /sys/fs/aufs/*; do + aufs_mount_dir=${aufs_si_dir#/sys/fs/aufs/} + aufs_si_id="$(printf "%s" $aufs_mount_dir | sed 's/_/=/g')" + aufs_mount_point="$(mountinfo -o ${aufs_si_id})" + for x in $aufs_si_dir/br[0-9][0-9][0-9]; do + aufs_branch=$(sed 's/=.*//g' $x) + eindent + if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then + ewarn "Failed to remove branch $aufs_branch from aufs \ + $aufs_mount_point" + fi + eoutdent + sync + done + done + fi + # Umount loop devices einfo "Unmounting loop devices" eindent diff --git a/init.d/loopback b/init.d/loopback index 4c7e6e1..a80a54c 100755 --- a/init.d/loopback +++ b/init.d/loopback @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2013 William Hubbs # Released under the 2-clause BSD license. @@ -13,7 +13,7 @@ start() { if [ "$RC_UNAME" = Linux ]; then ebegin "Bringing up network interface lo" - if type ip > /dev/null 2>&1; then + if command -v ip > /dev/null 2>&1; then ip addr add 127.0.0.1/8 dev lo brd + scope host ip route add 127.0.0.0/8 dev lo scope host ip link set lo up diff --git a/init.d/modules b/init.d/modules index 17f60ce..15f98b0 100755 --- a/init.d/modules +++ b/init.d/modules @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/mount-ro b/init.d/mount-ro index 69e6483..8a0a23d 100755 --- a/init.d/mount-ro +++ b/init.d/mount-ro @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. @@ -15,7 +15,7 @@ start() local ret=0 # Flush all pending disk writes now - sync; sync + sync ebegin "Remounting remaining filesystems read-only" # We need the do_unmount function diff --git a/init.d/netmount b/init.d/netmount index be1a3ba..b085e86 100755 --- a/init.d/netmount +++ b/init.d/netmount @@ -1,11 +1,8 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. -description="Mounts network shares, other than NFS, according to /etc/fstab." -# We skip all NFS shares in this script because they require extra -# daemons to be running on the client in order to work correctly. -# It is best to allow nfs-utils to handle all nfs shares. +description="Mounts network shares according to /etc/fstab." depend() { @@ -19,11 +16,6 @@ start() { local x= fs= rc= for x in $net_fs_list $extra_net_fs_list; do - case "$x" in - nfs|nfs4) - continue - ;; - esac fs="$fs${fs:+,}$x" done @@ -46,14 +38,7 @@ stop() . "$RC_LIBEXECDIR"/sh/rc-mount.sh for x in $net_fs_list $extra_net_fs_list; do - case "$x" in - nfs|nfs4) - continue - ;; - *) - fs="$fs${fs:+,}$x" - ;; - esac + fs="$fs${fs:+,}$x" done if [ -n "$fs" ]; then umount -at $fs || eerror "Failed to simply unmount filesystems" @@ -62,14 +47,7 @@ stop() eindent fs= for x in $net_fs_list $extra_net_fs_list; do - case "$x" in - nfs|nfs4) - continue - ;; - *) - fs="$fs${fs:+|}$x" - ;; - esac + fs="$fs${fs:+|}$x" done [ -n "$fs" ] && fs="^($fs)$" do_unmount umount ${fs:+--fstype-regex} $fs --netdev diff --git a/init.d/numlock b/init.d/numlock index e354dfd..4f7e830 100755 --- a/init.d/numlock +++ b/init.d/numlock @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/procfs b/init.d/procfs index 6efa34f..98145e6 100755 --- a/init.d/procfs +++ b/init.d/procfs @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. @@ -61,10 +61,10 @@ start() fi # Setup Kernel Support for SELinux - if [ -d /selinux ] && ! mountinfo -q /selinux; then + if [ -d /sys/fs/selinux ] && ! mountinfo -q /sys/fs/selinux; then if grep -qs selinuxfs /proc/filesystems; then ebegin "Mounting SELinux filesystem" - mount -t selinuxfs selinuxfs /selinux + mount -t selinuxfs selinuxfs /sys/fs/selinux eend $? fi fi diff --git a/init.d/root b/init.d/root index 04687c6..d431022 100755 --- a/init.d/root +++ b/init.d/root @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/savecache b/init.d/savecache index 5e59b25..3eed432 100755 --- a/init.d/savecache +++ b/init.d/savecache @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. @@ -13,8 +13,8 @@ start() return 1 fi fi - if ! checkpath -W "$RC_LIBEXECDIR"; then - ewarn "WARNING: ${RC_LIBEXECDIR} is not writable!" + if ! checkpath -W "$RC_LIBEXECDIR"/cache; then + ewarn "WARNING: ${RC_LIBEXECDIR}/cache is not writable!" if ! yesno "${RC_GOINGDOWN}"; then ewarn "Unable to save deptree cache" return 1 diff --git a/init.d/swap b/init.d/swap index 309d37b..5d68dd9 100755 --- a/init.d/swap +++ b/init.d/swap @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/swapfiles b/init.d/swapfiles index 8a851fa..754ae1d 100755 --- a/init.d/swapfiles +++ b/init.d/swapfiles @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/swclock b/init.d/swclock index ba9cd3d..b43819b 100755 --- a/init.d/swclock +++ b/init.d/swclock @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2009 Roy Marples # Released under the 2-clause BSD license. @@ -17,7 +17,7 @@ start() { ebegin "Setting the local clock based on last shutdown time" if ! swclock 2> /dev/null; then - swclock --warn /sbin/runscript + swclock --warn /sbin/openrc-run fi eend $? } diff --git a/init.d/sysctl b/init.d/sysctl index b94dcc4..5a4159c 100755 --- a/init.d/sysctl +++ b/init.d/sysctl @@ -1,34 +1,16 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2008 Roy Marples # Released under the 2-clause BSD license. depend() { before bootmisc logger - keyword -lxc -prefix -vserver + keyword -prefix -vserver } start() { - local conf= retval=0 err errs - ebegin "Configuring kernel parameters" - eindent - - for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do - if [ -r "$conf" ]; then - vebegin "applying $conf" - if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then - errs="${errs} ${err}" - sysctl -e -p "${conf}" >/dev/null - fi - veend $? || retval=1 - fi - done - - eoutdent - if [ ${retval} -eq 0 ] && [ -n "${errs}" ] ; then - ewarn "Unknown keys:${errs}" - fi - eend $retval "Some errors were encountered: ${errs}" + sysctl --system + eend $? "Unable to configure some kernel parameters" } diff --git a/init.d/sysfs b/init.d/sysfs index ec88c6d..0f84bfb 100755 --- a/init.d/sysfs +++ b/init.d/sysfs @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. @@ -99,19 +99,22 @@ mount_misc() mount_cgroups() { - mountinfo -q /sys/fs/cgroup || return 0 - - local agent="/lib64/rc/sh/cgroup-release-agent.sh" - mkdir /sys/fs/cgroup/openrc - mount -n -t cgroup \ - -o none,${sysfs_opts},name=openrc,release_agent="$agent" \ - openrc /sys/fs/cgroup/openrc - echo 1 > /sys/fs/cgroup/openrc/notify_on_release + mountinfo -q /sys/fs/cgroup || return 0 + + if ! mountinfo -q /sys/fs/cgroup/openrc; then + local agent="/lib64/rc/sh/cgroup-release-agent.sh" + mkdir /sys/fs/cgroup/openrc + mount -n -t cgroup \ + -o none,${sysfs_opts},name=openrc,release_agent="$agent" \ + openrc /sys/fs/cgroup/openrc + echo 1 > /sys/fs/cgroup/openrc/notify_on_release + fi yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0 while read name hier groups enabled rest; do case "${enabled}" in - 1) mkdir /sys/fs/cgroup/${name} + 1) mountinfo -q /sys/fs/cgroup/${name} && continue + mkdir /sys/fs/cgroup/${name} mount -n -t cgroup -o ${sysfs_opts},${name} \ ${name} /sys/fs/cgroup/${name} ;; @@ -119,18 +122,21 @@ mount_cgroups() done < /proc/cgroups } +restorecon_sys() +{ + if [ -x /sbin/restorecon ]; then + ebegin "Restoring SELinux contexts in /sys" + restorecon -F /sys/devices/system/cpu/online >/dev/null 2>&1 + restorecon -rF /sys/fs/cgroup >/dev/null 2>&1 + eend $? + fi +} + start() { - local retval mount_sys - retval=$? - if [ $retval -eq 0 ]; then - mount_misc - retval=$? - fi - if [ $retval -eq 0 ]; then - mount_cgroups - retval=$? - fi - return $retval + mount_misc + mount_cgroups + restorecon_sys + return 0 } diff --git a/init.d/termencoding b/init.d/termencoding index b949b76..ddd5bb0 100755 --- a/init.d/termencoding +++ b/init.d/termencoding @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2008-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/tmpfiles.dev b/init.d/tmpfiles.dev index 058980e..06d3a17 100755 --- a/init.d/tmpfiles.dev +++ b/init.d/tmpfiles.dev @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2012 Gentoo Foundation # Released under the 2-clause BSD license. @@ -14,8 +14,7 @@ depend() start() { ebegin "setting up tmpfiles.d entries for /dev" - /lib64/rc/sh/tmpfiles.sh --prefix=/dev --create --remove \ - ${tmpfiles_opts} + /lib64/rc/sh/tmpfiles.sh --prefix=/dev --create --boot ${tmpfiles_opts} eend $? return 0 } diff --git a/init.d/tmpfiles.setup b/init.d/tmpfiles.setup index 7772741..18af68e 100755 --- a/init.d/tmpfiles.setup +++ b/init.d/tmpfiles.setup @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2012 Gentoo Foundation # Released under the 2-clause BSD license. @@ -12,7 +12,7 @@ depend() start() { ebegin "setting up tmpfiles.d entries" - /lib64/rc/sh/tmpfiles.sh --exclude-prefix=/dev --create --remove \ + /lib64/rc/sh/tmpfiles.sh --exclude-prefix=/dev --create --remove --boot \ ${tmpfiles_opts} eend $? return 0 diff --git a/init.d/udev b/init.d/udev index 0e9abfe..72b2be2 100755 --- a/init.d/udev +++ b/init.d/udev @@ -13,33 +13,34 @@ udevmonitor_pid=/run/udevmonitor.pid depend() { - # we depend on udev-mount explicitly, not dev-mount generic as we don't - # want mdev as a dev-mount provider to come in. provide dev - need sysfs udev-mount + need sysfs dev-mount before checkfs fsck # udev does not work inside vservers keyword -vserver -lxc } -disable_oldnet_hotplug() +start_pre() { - if is_service_enabled network; then - # disable network hotplugging - local d="/run/udev/rules.d" - mkdir -p "${d}" - local f="${d}/90-network.rules" - echo "# This file disables network hotplug events calling" >> "${f}" - echo "# old-style openrc net scripts" >> "${f}" - echo "# as we use /etc/init.d/network to set up our network" >> "${f}" + # make sure devtmpfs is in the kernel + if ! grep -qs devtmpfs /proc/filesystems; then + eerror "CONFIG_DEVTMPFS=y is required in your kernel configuration" + eerror "for this version of udev to run successfully." + eerror "This requires immediate attention." + if ! mountinfo -q /dev; then + mount -n -t tmpfs dev /dev + busybox mdev -s + mkdir /dev/pts + fi + return 1 fi -} -start_pre() -{ - if [ -e /proc/sys/kernel/hotplug ]; then - echo "" >/proc/sys/kernel/hotplug + # make sure /dev is a mounted devtmpfs + if ! mountinfo -q -f devtmpfs /dev; then + eerror "Udev requires /dev to be a mounted devtmpfs." + eerror "Please reconfigure your system." + return 1 fi # load unix domain sockets if built as module, Bug #221253 @@ -51,10 +52,6 @@ start_pre() fi fi - if yesno "${udev_debug:-NO}"; then - command_args="${command_args} --debug 2> /run/udevdebug.log" - fi - bins="/sbin/udevd /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd" for f in ${bins}; do if [ -x "$f" -a ! -L "$f" ]; then @@ -66,21 +63,15 @@ start_pre() return 1 fi - # Need to do this before starting udev so it will load the rules. - disable_oldnet_hotplug - - return 0 -} - -is_service_enabled() -{ - local svc="$1" + if [ -e /proc/sys/kernel/hotplug ]; then + echo "" >/proc/sys/kernel/hotplug + fi - [ ! -e "/etc/init.d/${svc}" ] && return 1 + if yesno "${udev_debug:-NO}"; then + command_args="${command_args} --debug 2> /run/udevdebug.log" + fi - [ -e "/etc/runlevels/${RC_BOOTLEVEL}/${svc}" ] && return 0 - [ -e "/etc/runlevels/${RC_DEFAULTLEVEL}/${svc}" ] && return 0 - return 1 + return 0 } start_udevmonitor() @@ -93,11 +84,28 @@ start_udevmonitor() --background --exec /bin/udevadm -- monitor ${udev_monitor_opts} } +# This is here because some software expects /dev/root to exist. +# For more information, see this bug: +# https://bugs.gentoo.org/show_bug.cgi?id=438380 +dev_root_link() +{ + local RULESDIR=/run/udev/rules.d + [ -d $RULESDIR ] || mkdir -p $RULESDIR + eval $(udevadm info --export --export-prefix=ROOT_ --device-id-of-file=/ || + true) + [ "$ROOT_MAJOR" -a "$ROOT_MINOR" ] || return 0 + + # btrfs filesystems have bogus major/minor numbers + [ "$ROOT_MAJOR" != 0 ] || return 0 + + echo 'ACTION=="add|change", SUBSYSTEM=="block", ENV{MAJOR}=="'$ROOT_MAJOR'", ENV{MINOR}=="'$ROOT_MINOR'", SYMLINK+="root"' > $RULESDIR/61-dev-root-link.rules +} + populate_dev() { if yesno ${rc_dev_root_symlink:-yes}; then ebegin "Generating a rule to create a /dev/root symlink" - /lib/udev/dev-root-link.sh + dev_root_link eend $? fi diff --git a/init.d/udev-mount b/init.d/udev-mount deleted file mode 100755 index a868340..0000000 --- a/init.d/udev-mount +++ /dev/null @@ -1,81 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="mount devtmpfs on /dev" - -depend() -{ - provide dev-mount - keyword -vserver -lxc -} - -mount_dev_directory() -{ - local mounted=false fstab=false action=--mount msg=Mounting rc=0 - - if ! grep -qs devtmpfs /proc/filesystems; then - eerror "CONFIG_DEVTMPFS=y is required in your kernel configuration" - eerror "for this version of udev to run successfully." - eerror "This requires immediate attention." - if ! mountinfo -q /dev; then - mount -n -t tmpfs dev /dev - busybox mdev -s - mkdir /dev/pts - fi - return 1 - fi - - # Is /dev already a mounted devtmpfs? - mountinfo -q -f devtmpfs /dev && mounted=true - - # If an entry for /dev exists in fstab it must be a devtmpfs. - fstabinfo -q -t devtmpfs /dev && fstab=true - - # No options are processed here as they should all be in /etc/fstab - if $fstab; then - $mounted && action=--remount && msg=Remounting - ebegin "$msg /dev according to /etc/fstab" - fstabinfo $action /dev - rc=$? - elif ! $mounted; then - ebegin "Mounting /dev" - # Some devices require exec, Bug #92921 - mount -n -t devtmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev - rc=$? - else - ebegin "Using /dev mounted from kernel" - fi - - eend $rc -} - -seed_dev() -{ - # Seed /dev with some things that we know we need - - # creating /dev/console, /dev/tty and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ -c /dev/console ] || mknod -m 600 /dev/console c 5 1 - [ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1 - [ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3 - - # so udev can add its start-message to dmesg - [ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11 - - # Create problematic directories - mkdir -p /dev/pts /dev/shm - return 0 -} - -start() -{ - mount_dev_directory || return 1 - - seed_dev - return 0 -} diff --git a/init.d/urandom b/init.d/urandom index 4bfecab..780db12 100755 --- a/init.d/urandom +++ b/init.d/urandom @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/portage/savedconfig/sys-apps/busybox-1.21.0 b/portage/savedconfig/sys-apps/busybox-1.23.0 similarity index 88% rename from portage/savedconfig/sys-apps/busybox-1.21.0 rename to portage/savedconfig/sys-apps/busybox-1.23.0 index 3080cf6..48bed5f 100644 --- a/portage/savedconfig/sys-apps/busybox-1.21.0 +++ b/portage/savedconfig/sys-apps/busybox-1.23.0 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.21.0 -# Wed Sep 18 21:46:45 2013 +# Busybox version: 1.23.0 +# Wed Jan 21 21:36:00 2015 # CONFIG_HAVE_DOT_CONFIG=y @@ -13,7 +13,7 @@ CONFIG_HAVE_DOT_CONFIG=y # General Configuration # CONFIG_DESKTOP=y -CONFIG_EXTRA_COMPAT=y +# CONFIG_EXTRA_COMPAT is not set CONFIG_INCLUDE_SUSv2=y # CONFIG_USE_PORTABLE_CODE is not set CONFIG_PLATFORM_LINUX=y @@ -24,18 +24,20 @@ CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y CONFIG_FEATURE_COMPRESS_USAGE=y CONFIG_FEATURE_INSTALLER=y -CONFIG_INSTALL_NO_USR=y +# CONFIG_INSTALL_NO_USR is not set # CONFIG_LOCALE_SUPPORT is not set CONFIG_UNICODE_SUPPORT=y # CONFIG_UNICODE_USING_LOCALE is not set # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set CONFIG_SUBST_WCHAR=63 CONFIG_LAST_SUPPORTED_WCHAR=767 -CONFIG_UNICODE_COMBINING_WCHARS=y -CONFIG_UNICODE_WIDE_WCHARS=y +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set -CONFIG_UNICODE_PRESERVE_BROKEN=y +# CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_PAM is not set +CONFIG_FEATURE_USE_SENDFILE=y CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set @@ -47,7 +49,7 @@ CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set -CONFIG_FEATURE_PREFER_APPLETS=y +# CONFIG_FEATURE_PREFER_APPLETS is not set CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y # CONFIG_FEATURE_HAVE_RPC is not set @@ -73,6 +75,7 @@ CONFIG_EXTRA_LDLIBS="" # # CONFIG_DEBUG is not set # CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set @@ -99,21 +102,21 @@ CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 CONFIG_SHA3_SMALL=1 CONFIG_FEATURE_FAST_TOP=y -CONFIG_FEATURE_ETC_NETWORKS=y +# CONFIG_FEATURE_ETC_NETWORKS is not set CONFIG_FEATURE_USE_TERMIOS=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 -CONFIG_FEATURE_EDITING_VI=y +# CONFIG_FEATURE_EDITING_VI is not set CONFIG_FEATURE_EDITING_HISTORY=255 CONFIG_FEATURE_EDITING_SAVEHISTORY=y -CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y +# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set CONFIG_FEATURE_REVERSE_SEARCH=y CONFIG_FEATURE_TAB_COMPLETION=y -CONFIG_FEATURE_USERNAME_COMPLETION=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_FEATURE_EDITING_ASK_TERMINAL=y +# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set CONFIG_FEATURE_NON_POSIX_CP=y -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set CONFIG_FEATURE_COPYBUF_KB=4 CONFIG_FEATURE_SKIP_ROOTFS=y # CONFIG_MONOTONIC_SYSCALL is not set @@ -131,11 +134,18 @@ CONFIG_FEATURE_SEAMLESS_XZ=y CONFIG_FEATURE_SEAMLESS_LZMA=y CONFIG_FEATURE_SEAMLESS_BZ2=y CONFIG_FEATURE_SEAMLESS_GZ=y -CONFIG_FEATURE_SEAMLESS_Z=y -CONFIG_AR=y -CONFIG_FEATURE_AR_LONG_FILENAMES=y -CONFIG_FEATURE_AR_CREATE=y +# CONFIG_FEATURE_SEAMLESS_Z is not set +# CONFIG_AR is not set +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +# CONFIG_FEATURE_AR_CREATE is not set +# CONFIG_UNCOMPRESS is not set +CONFIG_GUNZIP=y CONFIG_BUNZIP2=y +CONFIG_UNLZMA=y +# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y CONFIG_BZIP2=y CONFIG_CPIO=y CONFIG_FEATURE_CPIO_O=y @@ -143,12 +153,11 @@ CONFIG_FEATURE_CPIO_P=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y CONFIG_GZIP=y CONFIG_FEATURE_GZIP_LONG_OPTIONS=y CONFIG_GZIP_FAST=0 CONFIG_LZOP=y -CONFIG_LZOP_COMPR_HIGH=y +# CONFIG_LZOP_COMPR_HIGH is not set # CONFIG_RPM2CPIO is not set # CONFIG_RPM is not set CONFIG_TAR=y @@ -163,12 +172,6 @@ CONFIG_FEATURE_TAR_TO_COMMAND=y CONFIG_FEATURE_TAR_UNAME_GNAME=y CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y # CONFIG_FEATURE_TAR_SELINUX is not set -CONFIG_UNCOMPRESS=y -CONFIG_UNLZMA=y -CONFIG_FEATURE_LZMA_FAST=y -CONFIG_LZMA=y -CONFIG_UNXZ=y -CONFIG_XZ=y CONFIG_UNZIP=y # @@ -178,18 +181,21 @@ CONFIG_BASENAME=y CONFIG_CAT=y CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y -CONFIG_FEATURE_DATE_NANO=y +# CONFIG_FEATURE_DATE_NANO is not set CONFIG_FEATURE_DATE_COMPAT=y # CONFIG_HOSTID is not set CONFIG_ID=y CONFIG_GROUPS=y +CONFIG_SHUF=y CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_NODEREF=y CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y +CONFIG_UNLINK=y CONFIG_BASE64=y CONFIG_WHO=y CONFIG_USERS=y @@ -297,6 +303,11 @@ CONFIG_FEATURE_WC_LARGE=y CONFIG_WHOAMI=y CONFIG_YES=y +# +# Common options +# +CONFIG_FEATURE_VERBOSE=y + # # Common options for cp and mv # @@ -363,14 +374,23 @@ CONFIG_WHICH=y # # Editors # +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y +CONFIG_CMP=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_LONG_OPTIONS=y +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y CONFIG_PATCH=y +CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 -CONFIG_FEATURE_VI_8BIT=y +# CONFIG_FEATURE_VI_8BIT is not set CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_REGEX_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set CONFIG_FEATURE_VI_USE_SIGNALS=y CONFIG_FEATURE_VI_DOT_CMD=y CONFIG_FEATURE_VI_READONLY=y @@ -378,14 +398,9 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_AWK=y -CONFIG_FEATURE_AWK_LIBM=y -CONFIG_CMP=y -CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_LONG_OPTIONS=y -CONFIG_FEATURE_DIFF_DIR=y -CONFIG_ED=y -CONFIG_SED=y +CONFIG_FEATURE_VI_UNDO=y +CONFIG_FEATURE_VI_UNDO_QUEUE=y +CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 CONFIG_FEATURE_ALLOW_EXEC=y # @@ -402,6 +417,7 @@ CONFIG_FEATURE_FIND_MAXDEPTH=y CONFIG_FEATURE_FIND_NEWER=y CONFIG_FEATURE_FIND_INUM=y CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_EXEC_PLUS=y CONFIG_FEATURE_FIND_USER=y CONFIG_FEATURE_FIND_GROUP=y CONFIG_FEATURE_FIND_NOT=y @@ -423,6 +439,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y +CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y # # Init Utilities @@ -436,7 +453,7 @@ CONFIG_HALT=y CONFIG_TELINIT_PATH="" CONFIG_INIT=y CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_KILL_REMOVED=y +# CONFIG_FEATURE_KILL_REMOVED is not set CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SYSLOG=y @@ -459,7 +476,8 @@ CONFIG_USE_BB_CRYPT=y CONFIG_USE_BB_CRYPT_SHA=y CONFIG_ADDUSER=y CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y -CONFIG_FEATURE_CHECK_NAMES=y +# CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_LAST_ID=60000 CONFIG_FIRST_SYSTEM_ID=100 CONFIG_LAST_SYSTEM_ID=999 CONFIG_ADDGROUP=y @@ -470,8 +488,7 @@ CONFIG_DELGROUP=y CONFIG_FEATURE_DEL_USER_FROM_GROUP=y CONFIG_GETTY=y CONFIG_LOGIN=y -CONFIG_LOGIN_SESSION_AS_CHILD=y -# CONFIG_PAM is not set +# CONFIG_LOGIN_SESSION_AS_CHILD is not set CONFIG_LOGIN_SCRIPTS=y CONFIG_FEATURE_NOLOGIN=y CONFIG_FEATURE_SECURETTY=y @@ -492,7 +509,7 @@ CONFIG_VLOCK=y CONFIG_CHATTR=y CONFIG_FSCK=y CONFIG_LSATTR=y -CONFIG_TUNE2FS=y +# CONFIG_TUNE2FS is not set # # Linux Module Utilities @@ -513,7 +530,7 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y # Options common to multiple modutils # # CONFIG_FEATURE_2_4_MODULES is not set -CONFIG_FEATURE_INSMOD_TRY_MMAP=y +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set @@ -529,6 +546,8 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # Linux System Utilities # CONFIG_BLOCKDEV=y +CONFIG_FATATTR=y +CONFIG_FSTRIM=y CONFIG_MDEV=y CONFIG_FEATURE_MDEV_CONF=y CONFIG_FEATURE_MDEV_RENAME=y @@ -539,7 +558,7 @@ CONFIG_REV=y CONFIG_ACPID=y CONFIG_FEATURE_ACPID_COMPAT=y CONFIG_BLKID=y -CONFIG_FEATURE_BLKID_TYPE=y +# CONFIG_FEATURE_BLKID_TYPE is not set CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y CONFIG_FBSET=y @@ -550,11 +569,11 @@ CONFIG_FDFORMAT=y CONFIG_FDISK=y # CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set CONFIG_FEATURE_FDISK_WRITABLE=y -CONFIG_FEATURE_AIX_LABEL=y -CONFIG_FEATURE_SGI_LABEL=y -CONFIG_FEATURE_SUN_LABEL=y -CONFIG_FEATURE_OSF_LABEL=y -CONFIG_FEATURE_GPT_LABEL=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_GPT_LABEL is not set CONFIG_FEATURE_FDISK_ADVANCED=y CONFIG_FINDFS=y CONFIG_FLOCK=y @@ -563,7 +582,7 @@ CONFIG_FREERAMDISK=y CONFIG_MKFS_EXT2=y # CONFIG_MKFS_MINIX is not set # CONFIG_FEATURE_MINIX2 is not set -CONFIG_MKFS_REISER=y +# CONFIG_MKFS_REISER is not set CONFIG_MKFS_VFAT=y CONFIG_GETOPT=y CONFIG_FEATURE_GETOPT_LONG=y @@ -572,7 +591,7 @@ CONFIG_FEATURE_HEXDUMP_REVERSE=y CONFIG_HD=y CONFIG_HWCLOCK=y CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y -CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set CONFIG_IPCRM=y CONFIG_IPCS=y CONFIG_LOSETUP=y @@ -584,7 +603,7 @@ CONFIG_MORE=y CONFIG_MOUNT=y CONFIG_FEATURE_MOUNT_FAKE=y CONFIG_FEATURE_MOUNT_VERBOSE=y -CONFIG_FEATURE_MOUNT_HELPERS=y +# CONFIG_FEATURE_MOUNT_HELPERS is not set CONFIG_FEATURE_MOUNT_LABEL=y # CONFIG_FEATURE_MOUNT_NFS is not set CONFIG_FEATURE_MOUNT_CIFS=y @@ -599,6 +618,7 @@ CONFIG_SCRIPT=y CONFIG_SCRIPTREPLAY=y CONFIG_SETARCH=y CONFIG_SWAPONOFF=y +CONFIG_FEATURE_SWAPON_DISCARD=y CONFIG_FEATURE_SWAPON_PRI=y CONFIG_SWITCH_ROOT=y CONFIG_UMOUNT=y @@ -609,37 +629,42 @@ CONFIG_FEATURE_UMOUNT_ALL=y # CONFIG_FEATURE_MOUNT_LOOP=y CONFIG_FEATURE_MOUNT_LOOP_CREATE=y -CONFIG_FEATURE_MTAB_SUPPORT=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set CONFIG_VOLUMEID=y # # Filesystem/Volume identification # -CONFIG_FEATURE_VOLUMEID_EXT=y CONFIG_FEATURE_VOLUMEID_BTRFS=y -CONFIG_FEATURE_VOLUMEID_REISERFS=y -CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y CONFIG_FEATURE_VOLUMEID_EXFAT=y +CONFIG_FEATURE_VOLUMEID_EXT=y +CONFIG_FEATURE_VOLUMEID_F2FS=y +CONFIG_FEATURE_VOLUMEID_FAT=y CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y CONFIG_FEATURE_VOLUMEID_JFS=y -CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_LUKS=y CONFIG_FEATURE_VOLUMEID_NILFS=y CONFIG_FEATURE_VOLUMEID_NTFS=y -CONFIG_FEATURE_VOLUMEID_ISO9660=y -CONFIG_FEATURE_VOLUMEID_UDF=y -CONFIG_FEATURE_VOLUMEID_LUKS=y -CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y -CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_OCFS2=y +CONFIG_FEATURE_VOLUMEID_REISERFS=y CONFIG_FEATURE_VOLUMEID_ROMFS=y -CONFIG_FEATURE_VOLUMEID_SQUASHFS=y +# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set CONFIG_FEATURE_VOLUMEID_SYSV=y -CONFIG_FEATURE_VOLUMEID_OCFS2=y -CONFIG_FEATURE_VOLUMEID_LINUXRAID=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_XFS=y # # Miscellaneous Utilities # CONFIG_CONSPY=y +CONFIG_CROND=y +CONFIG_FEATURE_CROND_D=y +CONFIG_FEATURE_CROND_CALL_SENDMAIL=y +CONFIG_FEATURE_CROND_DIR="/var/spool/cron" CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 CONFIG_FEATURE_LESS_BRACKETS=y @@ -652,32 +677,32 @@ CONFIG_FEATURE_LESS_DASHCMD=y CONFIG_FEATURE_LESS_LINENUMS=y CONFIG_NANDWRITE=y CONFIG_NANDDUMP=y +# CONFIG_RFKILL is not set CONFIG_SETSERIAL=y +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set CONFIG_UBIATTACH=y CONFIG_UBIDETACH=y CONFIG_UBIMKVOL=y CONFIG_UBIRMVOL=y CONFIG_UBIRSVOL=y CONFIG_UBIUPDATEVOL=y +CONFIG_WALL=y CONFIG_ADJTIMEX=y -CONFIG_BBCONFIG=y -CONFIG_FEATURE_COMPRESS_BBCONFIG=y +# CONFIG_BBCONFIG is not set +# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set # CONFIG_BEEP is not set CONFIG_FEATURE_BEEP_FREQ=0 CONFIG_FEATURE_BEEP_LENGTH_MS=0 CONFIG_CHAT=y CONFIG_FEATURE_CHAT_NOFAIL=y -CONFIG_FEATURE_CHAT_TTY_HIFI=y +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set CONFIG_FEATURE_CHAT_IMPLICIT_CR=y CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y CONFIG_FEATURE_CHAT_SEND_ESCAPES=y CONFIG_FEATURE_CHAT_VAR_ABORT_LEN=y CONFIG_FEATURE_CHAT_CLR_ABORT=y CONFIG_CHRT=y -CONFIG_CROND=y -CONFIG_FEATURE_CROND_D=y -CONFIG_FEATURE_CROND_CALL_SENDMAIL=y -CONFIG_FEATURE_CROND_DIR="/var/spool/cron" # CONFIG_CRONTAB is not set # CONFIG_DC is not set # CONFIG_FEATURE_DC_LIBM is not set @@ -690,10 +715,10 @@ CONFIG_DEVMEM=y CONFIG_EJECT=y CONFIG_FEATURE_EJECT_SCSI=y # CONFIG_FBSPLASH is not set -CONFIG_FLASHCP=y -CONFIG_FLASH_LOCK=y -CONFIG_FLASH_UNLOCK=y -CONFIG_FLASH_ERASEALL=y +# CONFIG_FLASHCP is not set +# CONFIG_FLASH_LOCK is not set +# CONFIG_FLASH_UNLOCK is not set +# CONFIG_FLASH_ERASEALL is not set CONFIG_IONICE=y # CONFIG_INOTIFYD is not set CONFIG_LAST=y @@ -715,18 +740,14 @@ CONFIG_MOUNTPOINT=y CONFIG_MT=y CONFIG_RAIDAUTORUN=y CONFIG_READAHEAD=y -# CONFIG_RFKILL is not set CONFIG_RUNLEVEL=y CONFIG_RX=y CONFIG_SETSID=y CONFIG_STRINGS=y -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set CONFIG_TIME=y CONFIG_TIMEOUT=y CONFIG_TTYSIZE=y CONFIG_VOLNAME=y -CONFIG_WALL=y CONFIG_WATCHDOG=y # @@ -738,15 +759,15 @@ CONFIG_NBDCLIENT=y CONFIG_NC=y CONFIG_NC_SERVER=y CONFIG_NC_EXTRA=y -CONFIG_NC_110_COMPAT=y +# CONFIG_NC_110_COMPAT is not set CONFIG_PING=y CONFIG_PING6=y CONFIG_FEATURE_FANCY_PING=y CONFIG_WHOIS=y CONFIG_FEATURE_IPV6=y -CONFIG_FEATURE_UNIX_LOCAL=y +# CONFIG_FEATURE_UNIX_LOCAL is not set CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -CONFIG_VERBOSE_RESOLUTION_ERRORS=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set CONFIG_ARP=y CONFIG_ARPING=y CONFIG_BRCTL=y @@ -758,13 +779,13 @@ CONFIG_ETHER_WAKE=y CONFIG_FTPD=y CONFIG_FEATURE_FTP_WRITE=y CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FEATURE_FTP_AUTHENTICATION=y # CONFIG_FTPGET is not set # CONFIG_FTPPUT is not set # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y CONFIG_HTTPD=y CONFIG_FEATURE_HTTPD_RANGES=y -CONFIG_FEATURE_HTTPD_USE_SENDFILE=y CONFIG_FEATURE_HTTPD_SETUID=y CONFIG_FEATURE_HTTPD_BASIC_AUTH=y CONFIG_FEATURE_HTTPD_AUTH_MD5=y @@ -791,7 +812,7 @@ CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y CONFIG_FEATURE_IFUPDOWN_IPV4=y CONFIG_FEATURE_IFUPDOWN_IPV6=y CONFIG_FEATURE_IFUPDOWN_MAPPING=y -CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y +# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set # CONFIG_INETD is not set # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set @@ -806,7 +827,7 @@ CONFIG_FEATURE_IP_ROUTE=y CONFIG_FEATURE_IP_TUNNEL=y CONFIG_FEATURE_IP_RULE=y CONFIG_FEATURE_IP_SHORT_FORMS=y -CONFIG_FEATURE_IP_RARE_PROTOCOLS=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set CONFIG_IPADDR=y CONFIG_IPLINK=y CONFIG_IPROUTE=y @@ -821,6 +842,7 @@ CONFIG_FEATURE_NETSTAT_PRG=y CONFIG_NSLOOKUP=y CONFIG_NTPD=y CONFIG_FEATURE_NTPD_SERVER=y +CONFIG_FEATURE_NTPD_CONF=y CONFIG_PSCAN=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set @@ -841,24 +863,25 @@ CONFIG_FEATURE_TFTP_GET=y CONFIG_FEATURE_TFTP_PUT=y CONFIG_FEATURE_TFTP_BLOCKSIZE=y CONFIG_FEATURE_TFTP_PROGRESS_BAR=y -CONFIG_TFTP_DEBUG=y +# CONFIG_TFTP_DEBUG is not set CONFIG_TRACEROUTE=y CONFIG_TRACEROUTE6=y CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y -CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set CONFIG_TUNCTL=y CONFIG_FEATURE_TUNCTL_UG=y -CONFIG_UDHCPC6=y +# CONFIG_UDHCPC6 is not set CONFIG_UDHCPD=y CONFIG_DHCPRELAY=y CONFIG_DUMPLEASES=y CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y -CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y -CONFIG_FEATURE_UDHCP_PORT=y +CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y +# CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=9 CONFIG_FEATURE_UDHCP_RFC3397=y CONFIG_FEATURE_UDHCP_8021Q=y @@ -928,7 +951,7 @@ CONFIG_PS=y # CONFIG_FEATURE_PS_LONG is not set CONFIG_FEATURE_PS_TIME=y CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y -CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS=y +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set CONFIG_RENICE=y CONFIG_BB_SYSCTL=y CONFIG_FEATURE_SHOW_THREADS=y @@ -976,6 +999,7 @@ CONFIG_ASH_GETOPTS=y CONFIG_ASH_BUILTIN_ECHO=y CONFIG_ASH_BUILTIN_PRINTF=y CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_HELP=y CONFIG_ASH_CMDCMD=y # CONFIG_ASH_MAIL is not set CONFIG_ASH_OPTIMIZE_FOR_SIZE=y @@ -1008,8 +1032,8 @@ CONFIG_FEATURE_BASH_IS_NONE=y CONFIG_SH_MATH_SUPPORT=y CONFIG_SH_MATH_SUPPORT_64=y CONFIG_FEATURE_SH_EXTRA_QUIET=y -CONFIG_FEATURE_SH_STANDALONE=y -CONFIG_FEATURE_SH_NOFORK=y +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_FEATURE_SH_NOFORK is not set CONFIG_FEATURE_SH_HISTFILESIZE=y # diff --git a/rc.conf b/rc.conf index f150285..f8f9900 100644 --- a/rc.conf +++ b/rc.conf @@ -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/resolv.conf b/resolv.conf index 05dd208..b747253 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,4 +1,4 @@ domain brehm-online.com -search uhu-banane.de brehm-online.com brehm-online.eu brehm-berlin.de hennig-berlin.org +search uhu-banane.de brehm-online.com hennig-berlin.org nameserver 127.0.0.1 nameserver 85.214.134.152 diff --git a/texmf/ls-R b/texmf/ls-R index 5ad5827..c456750 100644 --- a/texmf/ls-R +++ b/texmf/ls-R @@ -37,15 +37,15 @@ format.texlive-latex.cnf 20sizes.cnf ./updmap.d: -.keep_app-text_texlive-core-0 00updmap.cfg +.keep_app-text_texlive-core-0 texlive-basic.cfg texlive-fontsrecommended.cfg texlive-latex.cfg ./web2c: -.keep_app-text_texlive-core-0 fmtutil.cnf +.keep_app-text_texlive-core-0 texmf.cnf updmap.cfg diff --git a/xml/catalog b/xml/catalog index 70d4112..f149b2d 100644 --- a/xml/catalog +++ b/xml/catalog @@ -3,6 +3,7 @@ + @@ -11,5 +12,4 @@ - -- 2.39.5