From: Frank Brehm Date: Mon, 2 Feb 2015 15:06:07 +0000 (+0100) Subject: Current state X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=db44677f81eb30a33293e05e887f144cad02a60c;p=config%2Fbruni%2Fetc.git Current state --- diff --git a/ImageMagick-6/delegates.xml b/ImageMagick-6/delegates.xml index 855352e0..f838a0e5 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 e4908b1f..16e27903 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 9197be47..6a8ee9df 100644 --- a/ImageMagick-6/type.xml +++ b/ImageMagick-6/type.xml @@ -17,5 +17,5 @@ ]> - + diff --git a/conf.d/devfs b/conf.d/devfs new file mode 100644 index 00000000..51f80370 --- /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 db790a26..51ab189d 100644 --- a/conf.d/hwclock +++ b/conf.d/hwclock @@ -7,8 +7,9 @@ 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" 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 6debfc95..227d3b94 100644 --- a/conf.d/keymaps +++ b/conf.d/keymaps @@ -19,6 +19,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/conf.d/modules b/conf.d/modules index 47ce6370..70b26efc 100644 --- a/conf.d/modules +++ b/conf.d/modules @@ -22,4 +22,4 @@ # You should consult your kernel documentation and configuration # for a list of modules and their options. -modules="vboxdrv vboxnetadp vboxnetflt" +modules="vboxdrv vboxnetadp vboxnetflt tun" diff --git a/conf.d/nfsclient b/conf.d/nfsclient new file mode 100644 index 00000000..d885b637 --- /dev/null +++ b/conf.d/nfsclient @@ -0,0 +1,7 @@ +# You will need to set the dependencies in the nfsclient script to match +# the network configuration tools you are using. This should be done in +# this file by following the examples below, and not by changing the +# service script itself. See /etc/conf.d/netmount for more examples. +# +# This is a safe default. +rc_after="net" diff --git a/conf.d/nfsmount b/conf.d/nfsmount deleted file mode 100644 index 41835366..00000000 --- a/conf.d/nfsmount +++ /dev/null @@ -1,7 +0,0 @@ -# You will need to set the dependencies in the nfsmount script to match -# the network configuration tools you are using. This should be done in -# this file by following the examples below, and not by changing the -# service script itself. See /etc/conf.d/netmount for more examples. -# -# This is a safe default. -rc_after="net" diff --git a/config-archive/etc/conf.d/hwclock b/config-archive/etc/conf.d/hwclock index e1dff136..db790a26 100644 --- a/config-archive/etc/conf.d/hwclock +++ b/config-archive/etc/conf.d/hwclock @@ -1,22 +1,20 @@ # Set CLOCK to "UTC" if your Hardware Clock is set to UTC (also known as -# Greenwich Mean Time). If that clock is set to the local time, then -# set CLOCK to "local". Note that if you dual boot with Windows, then +# Greenwich Mean Time). If that clock is set to the local time, then +# set CLOCK to "local". Note that if you dual boot with Windows, then # you should set it to "local". clock="UTC" -# If you want to set the Hardware Clock to the current System Time -# (software clock) during shutdown, then say "YES" here. -# You normally don't need to do this if you run a ntp daemon. +# 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. +clock_hctosys="YES" + +# If you do not want to set the hardware clock to the current system +# time (software clock) during shutdown, set this to no. clock_systohc="YES" -# If you want to set the system time to the current hardware clock -# during bootup, then say "YES" here. You do not need this if you are -# running a modern kernel with CONFIG_RTC_HCTOSYS set to y. -# Also, be aware that if you set this to "NO", the system time will -# never be saved to the hardware clock unless you set -# clock_systohc="YES" above. -clock_hctosys="YES" - # If you wish to pass any other arguments to hwclock during bootup, # you may do so here. Alpha users may wish to use --arc or --srm here. clock_args="" diff --git a/config-archive/etc/conf.d/hwclock.1 b/config-archive/etc/conf.d/hwclock.1 new file mode 100644 index 00000000..e1dff136 --- /dev/null +++ b/config-archive/etc/conf.d/hwclock.1 @@ -0,0 +1,22 @@ +# Set CLOCK to "UTC" if your Hardware Clock is set to UTC (also known as +# Greenwich Mean Time). If that clock is set to the local time, then +# set CLOCK to "local". Note that if you dual boot with Windows, then +# you should set it to "local". +clock="UTC" + +# If you want to set the Hardware Clock to the current System Time +# (software clock) during shutdown, then say "YES" here. +# You normally don't need to do this if you run a ntp daemon. +clock_systohc="YES" + +# If you want to set the system time to the current hardware clock +# during bootup, then say "YES" here. You do not need this if you are +# running a modern kernel with CONFIG_RTC_HCTOSYS set to y. +# Also, be aware that if you set this to "NO", the system time will +# never be saved to the hardware clock unless you set +# clock_systohc="YES" above. +clock_hctosys="YES" + +# If you wish to pass any other arguments to hwclock during bootup, +# you may do so here. Alpha users may wish to use --arc or --srm here. +clock_args="" diff --git a/config-archive/etc/conf.d/hwclock.dist b/config-archive/etc/conf.d/hwclock.dist index 59bb732d..ce9b40ab 100644 --- a/config-archive/etc/conf.d/hwclock.dist +++ b/config-archive/etc/conf.d/hwclock.dist @@ -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/config-archive/etc/conf.d/keymaps b/config-archive/etc/conf.d/keymaps index 002b2d40..6debfc95 100644 --- a/config-archive/etc/conf.d/keymaps +++ b/config-archive/etc/conf.d/keymaps @@ -13,7 +13,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 00000000..002b2d40 --- /dev/null +++ b/config-archive/etc/conf.d/keymaps.1 @@ -0,0 +1,24 @@ +# Use keymap to specify the default console keymap. There is a complete tree +# of keymaps in /usr/share/keymaps to choose from. +#keymap="us" +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 35d5b892..e4544339 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 388d2e48..8990bad0 100644 --- a/config-archive/etc/rc.conf +++ b/config-archive/etc/rc.conf @@ -7,8 +7,8 @@ # 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" +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 @@ -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" @@ -129,6 +133,8 @@ unicode="YES" #rc_foo_bar_need="openvpn" #rc_foo_bar_after="clock" +rc_local_after="mta" + # You can also remove dependencies. # This is mainly used for saying which servies do NOT provide net. #rc_net_tap0_provide="!net" @@ -155,10 +161,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 722c40a0..388d2e48 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 9d8afee3..722c40a0 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 00000000..9d8afee3 --- /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 ec1c4a46..0970fb9b 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/cups/printers.conf b/cups/printers.conf index 4f0b6172..606348c1 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.7.5 -# Written by cupsd on 2014-11-26 07:04 +# Written by cupsd on 2015-01-06 01:15 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index 3810e03a..3149cbbf 100644 --- a/cups/subscriptions.conf +++ b/cups/subscriptions.conf @@ -1,3 +1,3 @@ -# Subscription configuration file for CUPS v1.7.1 -# Written by cupsd on 2014-11-16 19:21 -NextSubscriptionId 212 +# Subscription configuration file for CUPS v1.7.5 +# Written by cupsd on 2015-01-25 20:43 +NextSubscriptionId 213 diff --git a/exports.d/.keep_net-fs_nfs-utils-0 b/exports.d/.keep_net-fs_nfs-utils-0 new file mode 100644 index 00000000..e69de29b diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml index 1e2bcc1f..7d9273f6 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -8292,13 +8292,13 @@ z.B. »Sans Italic 10«. - - Das an die Vorgabe-Terminal-Anwendung zu übergebende exec-Argument. + + Das zum Ausführen von Programmen im Terminal verwendete, vom Schlüssel »exec« festgelegte Argument. - - Die Vorgabe-Terminal-Anwendung, die für Anwendungen verwendet wird, die ein Terminal erforderlich machen. + + Zu verwendende Terminal-Anwendung beim Starten von Anwendungen, die ein Terminal benötigen. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml index 551ae6d3..9341d563 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml @@ -8223,13 +8223,13 @@ - - The exec argument to use for the default terminal application. + + Argument used to execute programs in the terminal defined by the 'exec' key. - - The default terminal application to use for applications that require a terminal. + + Terminal program to use when starting applications that require one. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml index 62031b2c..04c9646a 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -8234,13 +8234,13 @@ - - Аргумент exec, использующийся приложением терминала по умолчанию. + + Аргумент, используемый при запуске программ в терминале по ключу «exec». - - Приложение терминала, используемое по умолчанию приложениями, нуждающимися в терминале. + + Терминал, который используется для запуска нуждающихся в нём приложений. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml index 55d6f667..2f3b7a81 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml @@ -7425,13 +7425,13 @@ vào danh sách này. Phải khởi động lại bảng điều khiển để - - Đối số thực hiện cần dùng cho ứng dụng thiết bị cuối mặc định + + Đối số được dùng để thực hiện chương trình trong thiết bị cuối được định nghĩa bởi khóa « exec » (thực hiện). - - Ứng dụng thiết bị cuối mặc định cần dùng cho các ứng dụng cần thiết thiết bị cuối. + + Chương trình thiết bị cuối cần dùng để khởi chạy ứng dụng có yêu cầu. diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 582be9d5..a1dba722 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -2233,28 +2233,28 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -2288,99 +2288,99 @@ - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - + + - - - - - - - + + + + + + + - + @@ -2939,7 +2939,7 @@ - + @@ -3093,43 +3093,43 @@ - - + + - - + + - - - + + + - - - - + + + + - - + + - - + + - - + + @@ -17369,7 +17369,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17377,7 +17377,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Cursor theme name. Used only by Xservers that support Xcursor, @@ -17385,7 +17385,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Font name of the cursor. If unset, the default font is @@ -17395,26 +17395,26 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Highlights the current location of the pointer when the Control key is pressed and released. - + Length of a double click. - + Distance before a drag is started. - + Distance in pixels the pointer must move before @@ -17422,20 +17422,20 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati system default. - + Acceleration multiplier for mouse motion. A value of -1 is the system default. - + Single click to open icons. - + Swap left and right mouse buttons for left-handed mice. @@ -17443,28 +17443,28 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + When set to true, GNOME will remember the state of the NumLock LED between sessions. - + File name of the bell sound to be played. - + - + - + on @@ -17472,27 +17472,27 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati possible values are "on", "off", and "custom". - + - + - + - + - + @@ -17655,7 +17655,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17663,7 +17663,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17671,7 +17671,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17679,7 +17679,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17689,7 +17689,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + crux_teal @@ -17700,7 +17700,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -17709,109 +17709,109 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + - + Beep when a modifier is pressed. - + Disable if two keys are pressed at the same time. - + - + - + - + - + Do not accept a key as being pressed unless held for @delay milliseconds. - + - + How many milliseconds to wait before mouse movement keys start to operate. - + How many milliseconds it takes to go from 0 to maximum speed. - + How many pixels per second to move at the maximum speed. - + - + - + Ignore multiple presses of the _same_ key within @delay milliseconds. - + - + - + - + - + @@ -17819,21 +17819,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Whether the context menus of entries and text views should offer to insert control characters. - + Whether the context menus of entries and text views should offer to change the input method. - + F10 @@ -17841,7 +17841,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Keyboard shortcut to open the menu bars. - + gio @@ -17851,19 +17851,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati "gtk+". - + Whether to display a status bar meter on the right. - + Whether to use a custom font in gtk+ applications. - + Monospace 10 @@ -17872,7 +17872,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati in locations like terminals. - + Sans 10 @@ -17880,7 +17880,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Name of the default font used for reading documents. - + @@ -17888,7 +17888,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Name of the input method module used by GTK+. - + callback @@ -17896,7 +17896,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Name of the GTK+ input method Status Style used by gtk+. - + callback @@ -17904,7 +17904,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Name of the GTK+ input method Preedit Style used by gtk+. - + Sans 10 @@ -17912,7 +17912,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Name of the default font used by gtk+. - + Default @@ -17920,7 +17920,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Basename of the default theme used by gtk+. - + Adwaita @@ -17928,7 +17928,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Basename of the default theme used by gtk+. - + gnome @@ -17936,19 +17936,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Icon theme to use for the panel, nautilus etc. - + Length of the cursor blink cycle, in milliseconds. - + Whether the cursor should blink. - + large-toolbar @@ -17957,31 +17957,31 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati "large-toolbar". - + Whether the user can detach toolbars and move them around. - + Whether the user can detach menubars and move them around. - + Whether buttons may display an icon in addition to the button text. - + Whether menus may display an icon next to a menu entry. - + both-horiz @@ -17990,20 +17990,20 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati "text". - + Whether the user can dynamically type a new accelerator when positioned over an active menuitem. - + Whether menus should have a tearoff. - + Whether animations should be displayed. Note: This is a global @@ -18011,7 +18011,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Whether Applications should have accessibility support. @@ -18019,13 +18019,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Whether to play sounds on input events. - + freedesktop @@ -18033,26 +18033,26 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The XDG sound theme to use for event sounds. - + Whether to play sounds on user events. - + Enable sound server startup. - + The default mixer tracks used by the multimedia key bindings. - + @@ -18062,7 +18062,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -18070,7 +18070,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -18078,7 +18078,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -18087,7 +18087,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -18097,7 +18097,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -18106,7 +18106,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -18116,7 +18116,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -18128,13 +18128,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Maximum size of the thumbnail cache, in megabytes. Set to -1 to disable cleaning. - + Maximum age for thumbnails in the cache, in days. Set to -1 to disable cleaning. @@ -18142,7 +18142,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + solid @@ -18150,7 +18150,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati How to shade the background color. Possible values are "horizontal-gradient", "vertical-gradient", and "solid". - + #66ba00 @@ -18158,7 +18158,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Right or Bottom color when drawing gradients, not used for solid color. - + #66ba00 @@ -18166,13 +18166,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Left or Top color when drawing gradients, or the solid color. - + Opacity with which to draw the background picture. - + /usr/share/pixmaps/backgrounds/gnome/gentoo/gentoo-emergence.png @@ -18180,7 +18180,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati File to use for the background image. - + zoom @@ -18190,7 +18190,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati "stretched", "zoom", "spanned". - + Have GNOME draw the desktop background. @@ -18198,7 +18198,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Set to true to disable all external thumbnailer programs, independent on whether they are independently disabled/enabled. @@ -18210,13 +18210,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18226,13 +18224,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18242,13 +18238,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18258,13 +18252,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18274,13 +18266,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18290,13 +18280,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18306,13 +18294,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18322,13 +18308,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18338,13 +18322,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18354,13 +18336,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18370,13 +18350,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18386,13 +18364,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18402,13 +18378,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18418,13 +18392,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18434,13 +18406,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18450,13 +18420,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18466,13 +18434,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18482,13 +18448,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18498,13 +18462,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18514,13 +18476,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18530,13 +18490,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -20874,13 +20832,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Whether the default tasks application needs a terminal to run - + evolution @@ -20890,13 +20848,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Whether the default calendar application needs a terminal to run - + evolution @@ -20906,19 +20864,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Whether the default browser understands netscape remote. - + Whether the default browser needs a terminal to run. - + mozilla @@ -20928,7 +20886,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + A list with names of the first window manager workspaces. @@ -20936,7 +20894,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + The number of workspaces the window manager should use @@ -20944,7 +20902,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Window manager to try first. @@ -20952,7 +20910,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Fallback window manager if user window manager can't be found. @@ -20987,13 +20945,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + GNOME to start preferred Visual assistive technology application during login. - + orca @@ -21003,13 +20961,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + GNOME to start preferred Mobility assistive technology application during login. - + dasher @@ -21030,20 +20988,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - + + -x - The exec argument to use for the default terminal application. + Argument used to execute programs in the terminal defined + by the 'exec' key. - - + + gnome-terminal - The default terminal application to use for applications that require a terminal. + Terminal program to use when starting applications that require one. diff --git a/init.d/bootmisc b/init.d/bootmisc index d77c7207..b0798176 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 2ef35e71..47bf2a4f 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 4a6a7e89..6edcbe2b 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 a4083d00..98c2c43e 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 c2e883db..0130376d 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 fb6260f4..7d2a2d95 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 651590df..bc6aff9e 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 507424b7..0cadd7de 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 5552b977..f07de69c 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 6e4ddbf5..c65e01e7 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 79747653..89f4008b 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 4c7e6e1f..a80a54c2 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 17f60ce8..15f98b06 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 69e64831..8a0a23d3 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 be1a3ba3..b085e867 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/nfsclient b/init.d/nfsclient new file mode 100755 index 00000000..a13a5ce0 --- /dev/null +++ b/init.d/nfsclient @@ -0,0 +1,39 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsclient.initd,v 1.3 2014/12/24 18:09:21 radhermit Exp $ + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +depend() { + local opts myneed="" + if [ -e /etc/fstab ] ; then + fstabinfo -t nfs4 -q && myneed="$myneed rpc.idmapd" + fstabinfo -t nfs -q && myneed="$myneed rpc.statd" + + for opts in $(fstabinfo -o -t nfs,nfs4) ; do + case $opts in + *sec=krb*|*sec=spkm*) myneed="$myneed rpc.gssd" ;; + esac + done + fi + before netmount + config /etc/fstab + need portmap ${myneed} + provide nfsmount + use ypbind dns +} + +start() { + if [ -x /usr/sbin/sm-notify ] ; then + ebegin "Starting NFS sm-notify" + /usr/sbin/sm-notify ${OPTS_SMNOTIFY} + eend $? + fi + + # Make sure nfs support is loaded in the kernel #64709 + if [ -e /proc/modules ] && ! grep -qs 'nfs$' /proc/filesystems ; then + modprobe -q nfs + fi + return 0 +} diff --git a/init.d/nfsmount b/init.d/nfsmount deleted file mode 100755 index 6bb10099..00000000 --- a/init.d/nfsmount +++ /dev/null @@ -1,48 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.15 2013/03/24 20:29:48 vapier Exp $ - -[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs - -depend() { - local myneed="" - if [ -e /etc/fstab ] ; then - myneed="${myneed} $( - awk '!/^[[:space:]]*#/ && ($3 == "nfs" || $3 == "nfs4") { - if ($3 == "nfs4") - idmapd = "rpc.idmapd" - if ($4 ~ /sec=(krb|spkm)/) - gssd = "rpc.gssd" - } - END { print idmapd " " gssd } - ' /etc/fstab - )" - fi - config /etc/fstab - need portmap rpc.statd ${myneed} - use ypbind dns rpc.idmapd rpc.gssd -} - -start() { - if [ -x /usr/sbin/sm-notify ] ; then - ebegin "Starting NFS sm-notify" - /usr/sbin/sm-notify ${OPTS_SMNOTIFY} - eend $? - fi - - # Make sure nfs support is loaded in the kernel #64709 - if [ -e /proc/modules ] && ! grep -qs 'nfs$' /proc/filesystems ; then - modprobe -q nfs - fi - - ebegin "Mounting NFS filesystems" - mount -a -t nfs,nfs4 - eend $? -} - -stop() { - ebegin "Unmounting NFS filesystems" - umount -a -t nfs,nfs4 - eend $? -} diff --git a/init.d/numlock b/init.d/numlock index e354dfd1..4f7e830b 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 6efa34fb..98145e6a 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 04687c6e..d4310225 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 5e59b25f..3eed4322 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 309d37b7..5d68dd95 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 8a851fad..754ae1d5 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 ba9cd3d6..b43819b6 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 b94dcc4f..5a4159c4 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 ec88c6d0..0f84bfb4 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 b949b76b..ddd5bb0e 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 058980e4..06d3a179 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 77727414..18af68e6 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 0e9abfeb..72b2be22 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 a8683401..00000000 --- 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 4bfecab4..780db124 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/init.d/xdm b/init.d/xdm index 9826e6bb..2f7b47cb 100755 --- a/init.d/xdm +++ b/init.d/xdm @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-10,v 1.1 2013/09/26 15:23:33 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-11,v 1.1 2014/04/14 16:19:25 chithanh Exp $ # This is here to serve as a note to myself, and future developers. # @@ -106,6 +106,11 @@ setup_dm() { PIDFILE=/run/lightdm.pid START_STOP_ARGS="--background" ;; + sddm) + EXE="/usr/bin/sddm" + START_STOP_ARGS="-m --background" + PIDFILE=/run/sddm.pid + ;; *) # first find out if there is such executable EXE="$(command -v ${MY_XDM} 2>/dev/null)" diff --git a/portage/package.mask b/portage/package.mask index 26cda52d..9204dcdd 100644 --- a/portage/package.mask +++ b/portage/package.mask @@ -5,4 +5,6 @@ ~dev-libs/libgcrypt-1.5.2 ~dev-libs/libgcrypt-1.5.3 +=www-client/google-chrome-39.0.2171.99_p1 + #~gnome-base/gnome-3.8.0 diff --git a/portage/savedconfig/sys-apps/busybox-1.23.0 b/portage/savedconfig/sys-apps/busybox-1.23.0 new file mode 100644 index 00000000..dfd0b4a4 --- /dev/null +++ b/portage/savedconfig/sys-apps/busybox-1.23.0 @@ -0,0 +1,1055 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.23.0 +# Wed Jan 21 22:02:21 2015 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +CONFIG_DESKTOP=y +# CONFIG_EXTRA_COMPAT is not set +CONFIG_INCLUDE_SUSv2=y +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=y +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +CONFIG_FEATURE_COMPRESS_USAGE=y +CONFIG_FEATURE_INSTALLER=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 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 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 +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y +CONFIG_FEATURE_PIDFILE=y +CONFIG_PID_FILE_PATH="/var/run" +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 is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +# CONFIG_FEATURE_HAVE_RPC is not set + +# +# Build Options +# +CONFIG_STATIC=y +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_SYSROOT="" +CONFIG_EXTRA_CFLAGS="" +CONFIG_EXTRA_LDFLAGS="" +CONFIG_EXTRA_LDLIBS="" + +# +# Debugging Options +# +# 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 +# CONFIG_EFENCE is not set + +# +# Installation Options ("make install" behavior) +# +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_FEATURE_SYSTEMD=y +CONFIG_FEATURE_RTMINMAX=y +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SMALL=1 +CONFIG_SHA3_SMALL=1 +CONFIG_FEATURE_FAST_TOP=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 is not set +CONFIG_FEATURE_EDITING_HISTORY=255 +CONFIG_FEATURE_EDITING_SAVEHISTORY=y +# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set +CONFIG_FEATURE_REVERSE_SEARCH=y +CONFIG_FEATURE_TAB_COMPLETION=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set +CONFIG_FEATURE_NON_POSIX_CP=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 +CONFIG_IOCTL_HEX2STR_ERROR=y +CONFIG_FEATURE_HWIB=y + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_FEATURE_SEAMLESS_XZ=y +CONFIG_FEATURE_SEAMLESS_LZMA=y +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=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 +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_GZIP=y +CONFIG_FEATURE_GZIP_LONG_OPTIONS=y +CONFIG_GZIP_FAST=0 +CONFIG_LZOP=y +# CONFIG_LZOP_COMPR_HIGH is not set +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_AUTODETECT=y +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +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_UNZIP=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=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 +CONFIG_CAL=y +CONFIG_CATV=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y +CONFIG_CHROOT=y +CONFIG_CKSUM=y +CONFIG_COMM=y +CONFIG_CP=y +CONFIG_FEATURE_CP_LONG_OPTIONS=y +CONFIG_CUT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y +CONFIG_FEATURE_DD_IBS_OBS=y +CONFIG_DF=y +CONFIG_FEATURE_DF_FANCY=y +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +CONFIG_EXPAND=y +CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_FSYNC=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LN=y +# CONFIG_LOGNAME is not set +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y +CONFIG_NOHUP=y +# CONFIG_OD is not set +CONFIG_PRINTENV=y +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y +CONFIG_SHA3SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_FEATURE_FLOAT_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +CONFIG_STTY=y +CONFIG_SUM=y +CONFIG_SYNC=y +CONFIG_TAC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNEXPAND=y +CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options +# +CONFIG_FEATURE_VERBOSE=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_FGCONSOLE=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_KBD_MODE=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_RESIZE=y +CONFIG_FEATURE_RESIZE_PRINT=y +CONFIG_SETCONSOLE=y +CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y +CONFIG_SETFONT=y +CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y +CONFIG_DEFAULT_SETFONT_DIR="" +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y +CONFIG_SHOWKEY=y + +# +# Common options for loadfont and setfont +# +CONFIG_FEATURE_LOADFONT_PSF2=y +CONFIG_FEATURE_LOADFONT_RAW=y + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +# CONFIG_RUN_PARTS is not set +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +# CONFIG_FEATURE_RUN_PARTS_FANCY is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +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 is not set +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_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 +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_UNDO=y +CONFIG_FEATURE_VI_UNDO_QUEUE=y +CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +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 +CONFIG_FEATURE_FIND_DEPTH=y +CONFIG_FEATURE_FIND_PAREN=y +CONFIG_FEATURE_FIND_SIZE=y +CONFIG_FEATURE_FIND_PRUNE=y +CONFIG_FEATURE_FIND_DELETE=y +CONFIG_FEATURE_FIND_PATH=y +CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FEATURE_FIND_CONTEXT is not set +CONFIG_FEATURE_FIND_LINKS=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +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 +# +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set +CONFIG_GINIT=y +CONFIG_HALT=y +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +CONFIG_INIT=y +CONFIG_FEATURE_USE_INITTAB=y +# CONFIG_FEATURE_KILL_REMOVED is not set +CONFIG_FEATURE_KILL_DELAY=0 +CONFIG_FEATURE_INIT_SCTTY=y +CONFIG_FEATURE_INIT_SYSLOG=y +CONFIG_FEATURE_EXTRA_QUIET=y +CONFIG_FEATURE_INIT_COREDUMPS=y +CONFIG_FEATURE_INITRD=y +CONFIG_INIT_TERMINAL_TYPE="linux" +CONFIG_MESG=y +CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y + +# +# Login/Password Management Utilities +# +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set +CONFIG_FEATURE_SHADOWPASSWDS=y +CONFIG_USE_BB_PWD_GRP=y +CONFIG_USE_BB_SHADOW=y +CONFIG_USE_BB_CRYPT=y +CONFIG_USE_BB_CRYPT_SHA=y +CONFIG_ADDUSER=y +CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=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 +CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_DELUSER=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +CONFIG_GETTY=y +CONFIG_LOGIN=y +# CONFIG_LOGIN_SESSION_AS_CHILD is not set +CONFIG_LOGIN_SCRIPTS=y +CONFIG_FEATURE_NOLOGIN=y +CONFIG_FEATURE_SECURETTY=y +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +CONFIG_CRYPTPW=y +CONFIG_CHPASSWD=y +CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des" +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +# CONFIG_SULOGIN is not set +CONFIG_VLOCK=y + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_FSCK=y +CONFIG_LSATTR=y +# CONFIG_TUNE2FS is not set + +# +# Linux Module Utilities +# +CONFIG_MODINFO=y +CONFIG_MODPROBE_SMALL=y +CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y +CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y +# CONFIG_INSMOD is not set +# CONFIG_RMMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set +# CONFIG_DEPMOD is not set + +# +# Options common to multiple modutils +# +# CONFIG_FEATURE_2_4_MODULES is not set +# 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 +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +# CONFIG_FEATURE_MODUTILS_ALIAS is not set +# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +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 +CONFIG_FEATURE_MDEV_RENAME_REGEXP=y +CONFIG_FEATURE_MDEV_EXEC=y +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_REV=y +CONFIG_ACPID=y +CONFIG_FEATURE_ACPID_COMPAT=y +CONFIG_BLKID=y +# CONFIG_FEATURE_BLKID_TYPE is not set +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +CONFIG_FDFLUSH=y +CONFIG_FDFORMAT=y +CONFIG_FDISK=y +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set +CONFIG_FEATURE_FDISK_WRITABLE=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 +CONFIG_FREERAMDISK=y +# CONFIG_FSCK_MINIX is not set +CONFIG_MKFS_EXT2=y +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +# CONFIG_MKFS_REISER is not set +CONFIG_MKFS_VFAT=y +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y +CONFIG_HEXDUMP=y +CONFIG_FEATURE_HEXDUMP_REVERSE=y +CONFIG_HD=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +CONFIG_IPCRM=y +CONFIG_IPCS=y +CONFIG_LOSETUP=y +CONFIG_LSPCI=y +CONFIG_LSUSB=y +CONFIG_MKSWAP=y +CONFIG_FEATURE_MKSWAP_UUID=y +CONFIG_MORE=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_FAKE=y +CONFIG_FEATURE_MOUNT_VERBOSE=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 +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_RDEV is not set +# CONFIG_READPROFILE is not set +CONFIG_RTCWAKE=y +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 +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +CONFIG_FEATURE_VOLUMEID_BTRFS=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_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_OCFS2=y +CONFIG_FEATURE_VOLUMEID_REISERFS=y +CONFIG_FEATURE_VOLUMEID_ROMFS=y +# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set +CONFIG_FEATURE_VOLUMEID_SYSV=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 +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y +CONFIG_FEATURE_LESS_WINCH=y +CONFIG_FEATURE_LESS_ASK_TERMINAL=y +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 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 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_CRONTAB is not set +# CONFIG_DC is not set +# CONFIG_FEATURE_DC_LIBM is not set +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +CONFIG_DEVMEM=y +CONFIG_EJECT=y +CONFIG_FEATURE_EJECT_SCSI=y +# CONFIG_FBSPLASH is not set +# 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 +# CONFIG_FEATURE_LAST_SMALL is not set +CONFIG_FEATURE_LAST_FANCY=y +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y +CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +CONFIG_MAKEDEVS=y +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +CONFIG_MAN=y +CONFIG_MICROCOM=y +CONFIG_MOUNTPOINT=y +CONFIG_MT=y +CONFIG_RAIDAUTORUN=y +CONFIG_READAHEAD=y +CONFIG_RUNLEVEL=y +CONFIG_RX=y +CONFIG_SETSID=y +CONFIG_STRINGS=y +CONFIG_TIME=y +CONFIG_TIMEOUT=y +CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y +CONFIG_WATCHDOG=y + +# +# Networking Utilities +# +CONFIG_NAMEIF=y +CONFIG_FEATURE_NAMEIF_EXTENDED=y +CONFIG_NBDCLIENT=y +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=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 is not set +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +CONFIG_ARP=y +CONFIG_ARPING=y +CONFIG_BRCTL=y +CONFIG_FEATURE_BRCTL_FANCY=y +CONFIG_FEATURE_BRCTL_SHOW=y +# CONFIG_DNSD is not set +CONFIG_ETHER_WAKE=y +# CONFIG_FAKEIDENTD is not set +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_SETUID=y +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y +CONFIG_FEATURE_HTTPD_AUTH_MD5=y +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y +CONFIG_FEATURE_HTTPD_PROXY=y +CONFIG_FEATURE_HTTPD_GZIP=y +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +CONFIG_FEATURE_IFCONFIG_SLIP=y +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +CONFIG_IFENSLAVE=y +CONFIG_IFPLUGD=y +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +CONFIG_FEATURE_IFUPDOWN_IP=y +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +CONFIG_FEATURE_IFUPDOWN_MAPPING=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 +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +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 is not set +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +CONFIG_NETSTAT=y +CONFIG_FEATURE_NETSTAT_WIDE=y +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 +# CONFIG_TCPSVD is not set +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +CONFIG_TELNETD=y +CONFIG_FEATURE_TELNETD_STANDALONE=y +CONFIG_FEATURE_TELNETD_INETD_WAIT=y +CONFIG_TFTP=y +CONFIG_TFTPD=y + +# +# Common options for tftp/tftpd +# +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y +# CONFIG_TFTP_DEBUG is not set +CONFIG_TRACEROUTE=y +CONFIG_TRACEROUTE6=y +CONFIG_FEATURE_TRACEROUTE_VERBOSE=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 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 is not set +CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" +CONFIG_UDHCPC=y +CONFIG_FEATURE_UDHCPC_ARPING=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 +CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" +# CONFIG_UDPSVD is not set +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y +CONFIG_ZCIP=y + +# +# Print Utilities +# +# CONFIG_LPD is not set +CONFIG_LPR=y +CONFIG_LPQ=y + +# +# Mail Utilities +# +# CONFIG_MAKEMIME is not set +CONFIG_FEATURE_MIME_CHARSET="us-ascii" +CONFIG_POPMAILDIR=y +CONFIG_FEATURE_POPMAILDIR_DELIVERY=y +# CONFIG_REFORMIME is not set +# CONFIG_FEATURE_REFORMIME_COMPAT is not set +CONFIG_SENDMAIL=y + +# +# Process Utilities +# +CONFIG_IOSTAT=y +CONFIG_LSOF=y +CONFIG_MPSTAT=y +CONFIG_NMETER=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y +CONFIG_PSTREE=y +CONFIG_PWDX=y +# CONFIG_SMEMCAP is not set +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_SMP_CPU=y +CONFIG_FEATURE_TOP_DECIMALS=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y +CONFIG_UPTIME=y +CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_KILLALL5=y +CONFIG_PGREP=y +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +CONFIG_PKILL=y +CONFIG_PS=y +# CONFIG_FEATURE_PS_WIDE is not set +# CONFIG_FEATURE_PS_LONG is not set +CONFIG_FEATURE_PS_TIME=y +CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_FEATURE_SHOW_THREADS=y +CONFIG_WATCH=y + +# +# Runit Utilities +# +# CONFIG_RUNSV is not set +# CONFIG_RUNSVDIR is not set +# CONFIG_FEATURE_RUNSVDIR_LOG is not set +# CONFIG_SV is not set +CONFIG_SV_DEFAULT_SERVICE_DIR="" +# CONFIG_SVLOGD is not set +CONFIG_CHPST=y +CONFIG_SETUIDGID=y +CONFIG_ENVUIDGID=y +CONFIG_ENVDIR=y +CONFIG_SOFTLIMIT=y +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Shells +# +CONFIG_ASH=y +CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_IDLE_TIMEOUT is not set +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +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 +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y +CONFIG_CTTYHACK=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_HUSH_CASE is not set +# CONFIG_HUSH_FUNCTIONS is not set +# CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +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 is not set +# CONFIG_FEATURE_SH_NOFORK is not set +CONFIG_FEATURE_SH_HISTFILESIZE=y + +# +# System Logging Utilities +# +# CONFIG_SYSLOGD is not set +# CONFIG_FEATURE_ROTATE_LOGFILE is not set +# CONFIG_FEATURE_REMOTE_LOG is not set +# CONFIG_FEATURE_SYSLOGD_DUP is not set +# CONFIG_FEATURE_SYSLOGD_CFG is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 +# CONFIG_FEATURE_IPC_SYSLOG is not set +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 +# CONFIG_LOGREAD is not set +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +# CONFIG_FEATURE_KMSG_SYSLOG is not set +# CONFIG_KLOGD is not set +# CONFIG_FEATURE_KLOGD_KLOGCTL is not set +# CONFIG_LOGGER is not set diff --git a/ppp/firewall-masq b/ppp/firewall-masq new file mode 100644 index 00000000..14b99711 --- /dev/null +++ b/ppp/firewall-masq @@ -0,0 +1,71 @@ +#!/bin/sh +# +# firewall-masq This script sets up firewall rules for a machine +# acting as a masquerading gateway +# +# Copyright (C) 2000 Roaring Penguin Software Inc. This software may +# be distributed under the terms of the GNU General Public License, version +# 2 or any later version. +# LIC: GPL + +# Interface to Internet +EXTIF=ppp+ + +# NAT-Tables are different, so we can use ACCEPT everywhere (?) +iptables -t nat -P PREROUTING ACCEPT +iptables -t nat -P OUTPUT ACCEPT +iptables -t nat -P POSTROUTING ACCEPT + +# Flush the NAT-Table +iptables -t nat -F + +iptables -t filter -P INPUT DROP +iptables -t filter -F + +# Allow incoming SSH +#iptables -t filter -A INPUT -i $EXTIF -p tcp --dport 22 -j ACCEPT + +# Log & Deny the rest of the privileged ports +iptables -t filter -A INPUT -i $EXTIF -p tcp --dport 0:1023 -j LOG +iptables -t filter -A INPUT -i $EXTIF -p udp --dport 0:1023 -j LOG +iptables -t filter -A INPUT -i $EXTIF -p tcp --dport 0:1023 -j DROP +iptables -t filter -A INPUT -i $EXTIF -p udp --dport 0:1023 -j DROP + +# Log & Deny NFS +iptables -t filter -A INPUT -i $EXTIF -p udp --dport 2049 -j LOG +iptables -t filter -A INPUT -i $EXTIF -p tcp --dport 2049 -j LOG +iptables -t filter -A INPUT -i $EXTIF -p udp --dport 2049 -j DROP +iptables -t filter -A INPUT -i $EXTIF -p tcp --dport 2049 -j DROP + +# Log & Deny X11 +iptables -t filter -A INPUT -i $EXTIF -p tcp --dport 6000:6063 -j LOG +iptables -t filter -A INPUT -i $EXTIF -p tcp --dport 6000:6063 -j DROP + +# Log & Deny XFS +iptables -t filter -A INPUT -i $EXTIF -p tcp --dport 7100 -j LOG +iptables -t filter -A INPUT -i $EXTIF -p tcp --dport 7100 -j DROP + +# Deny TCP connection attempts +iptables -t filter -A INPUT -i $EXTIF -p tcp --syn -j LOG +iptables -t filter -A INPUT -i $EXTIF -p tcp --syn -j DROP + +# Deny ICMP echo-requests +iptables -t filter -A INPUT -i $EXTIF -p icmp --icmp-type echo-request -j DROP + +# Do masquerading +iptables -t nat -A POSTROUTING -o $EXTIF -j MASQUERADE + +# Enable forwarding +echo 1 > /proc/sys/net/ipv4/ip_forward + +# no IP spoofing +if [ -e /proc/sys/net/ipv4/conf/all/rp_filter ] ; then + for i in /proc/sys/net/ipv4/conf/*/rp_filter; do + echo 1 > $i + done +fi + +# Disable Source Routed Packets +for i in /proc/sys/net/ipv4/conf/*/accept_source_route; do + echo 0 > $i +done diff --git a/ppp/firewall-standalone b/ppp/firewall-standalone new file mode 100644 index 00000000..15b310e4 --- /dev/null +++ b/ppp/firewall-standalone @@ -0,0 +1,34 @@ +#!/bin/sh +# +# firewall-standalone This script sets up firewall rules for a standalone +# machine +# +# Copyright (C) 2005 Roaring Penguin Software Inc. This software may +# be distributed under the terms of the GNU General Public License, version +# 2 or any later version. +# LIC: GPL + +# Interface to Internet +EXTIF=ppp+ + +iptables -P INPUT ACCEPT +iptables -P OUTPUT ACCEPT +iptables -P FORWARD DROP + +iptables -F FORWARD +iptables -F INPUT +iptables -F OUTPUT + +# Deny TCP and UDP packets to privileged ports +iptables -A INPUT -p udp -i $EXTIF --dport 0:1023 -j LOG +iptables -A INPUT -p tcp -i $EXTIF --dport 0:1023 -j LOG +iptables -A INPUT -p udp -i $EXTIF --dport 0:1023 -j DROP +iptables -A INPUT -p tcp -i $EXTIF --dport 0:1023 -j DROP + +# Deny TCP connection attempts +iptables -A INPUT -i $EXTIF -p tcp --syn -j LOG +iptables -A INPUT -i $EXTIF -p tcp --syn -j DROP + +# Deny ICMP echo-requests +iptables -A INPUT -i $EXTIF -p icmp --icmp-type echo-request -j DROP + diff --git a/ppp/plugins/README b/ppp/plugins/README new file mode 100644 index 00000000..f7dfb762 --- /dev/null +++ b/ppp/plugins/README @@ -0,0 +1 @@ +# Directory created by rp-pppoe for kernel-mode plugin diff --git a/ppp/plugins/rp-pppoe.so b/ppp/plugins/rp-pppoe.so new file mode 120000 index 00000000..a7bfcce1 --- /dev/null +++ b/ppp/plugins/rp-pppoe.so @@ -0,0 +1 @@ +/usr/lib/pppd/2.4.7/rp-pppoe.so \ No newline at end of file diff --git a/ppp/pppoe-server-options b/ppp/pppoe-server-options new file mode 100644 index 00000000..b442db48 --- /dev/null +++ b/ppp/pppoe-server-options @@ -0,0 +1,6 @@ +# PPP options for the PPPoE server +# LIC: GPL +require-pap +login +lcp-echo-interval 10 +lcp-echo-failure 2 diff --git a/ppp/pppoe.conf b/ppp/pppoe.conf new file mode 100644 index 00000000..3bd71596 --- /dev/null +++ b/ppp/pppoe.conf @@ -0,0 +1,145 @@ +#*********************************************************************** +# +# pppoe.conf +# +# Configuration file for rp-pppoe. Edit as appropriate and install in +# /etc/ppp/pppoe.conf +# +# NOTE: This file is used by the pppoe-start, pppoe-stop, pppoe-connect and +# pppoe-status shell scripts. It is *not* used in any way by the +# "pppoe" executable. +# +# Copyright (C) 2000 Roaring Penguin Software Inc. +# +# This file may be distributed under the terms of the GNU General +# Public License. +# +# LIC: GPL +# $Id: pppoe.conf,v 1.11 2005/08/09 02:49:12 dfs Exp $ +#*********************************************************************** + +# When you configure a variable, DO NOT leave spaces around the "=" sign. + +# Ethernet card connected to DSL modem +# +# NB: Gentoo overrides ETH when pppoe-start is called from the +# networking scripts. This setting has no effect in that case. +ETH=eth1 + +# PPPoE user name. You may have to supply "@provider.com" Sympatico +# users in Canada do need to include "@sympatico.ca" +# Sympatico uses PAP authentication. Make sure /etc/ppp/pap-secrets +# contains the right username/password combination. +# For Magma, use xxyyzz@magma.ca +USER=bxxxnxnx@sympatico.ca + +# Bring link up on demand? Default is to leave link up all the time. +# If you want the link to come up on demand, set DEMAND to a number indicating +# the idle time after which the link is brought down. +DEMAND=no +#DEMAND=300 + +# DNS type: SERVER=obtain from server; SPECIFY=use DNS1 and DNS2; +# NOCHANGE=do not adjust. +DNSTYPE=SERVER + +# Obtain DNS server addresses from the peer (recent versions of pppd only) +# In old config files, this used to be called USEPEERDNS. Changed to +# PEERDNS for better Red Hat compatibility +PEERDNS=yes + +DNS1= +DNS2= + +# Make the PPPoE connection your default route. Set to +# DEFAULTROUTE=no if you don't want this. +DEFAULTROUTE=yes + +### ONLY TOUCH THE FOLLOWING SETTINGS IF YOU'RE AN EXPERT + +# How long pppoe-start waits for a new PPP interface to appear before +# concluding something went wrong. If you use 0, then pppoe-start +# exits immediately with a successful status and does not wait for the +# link to come up. Time is in seconds. +# +# WARNING WARNING WARNING: +# +# If you are using rp-pppoe on a physically-inaccessible host, set +# CONNECT_TIMEOUT to 0. This makes SURE that the machine keeps trying +# to connect forever after pppoe-start is called. Otherwise, it will +# give out after CONNECT_TIMEOUT seconds and will not attempt to +# connect again, making it impossible to reach. +CONNECT_TIMEOUT=30 + +# How often in seconds pppoe-start polls to check if link is up +CONNECT_POLL=2 + +# Specific desired AC Name +ACNAME= + +# Specific desired service name +SERVICENAME= + +# Character to echo at each poll. Use PING="" if you don't want +# anything echoed +PING="." + +# File where the pppoe-connect script writes its process-ID. +# Three files are actually used: +# $PIDFILE contains PID of pppoe-connect script +# $PIDFILE.pppoe contains PID of pppoe process +# $PIDFILE.pppd contains PID of pppd process +# +# NB: Gentoo overrides PIDFILE when pppoe-start is run from the +# networking scripts. This setting has no effect in that case. +PIDFILE="/var/run/rp-pppoe.pid" + +# Do you want to use synchronous PPP? "yes" or "no". "yes" is much +# easier on CPU usage, but may not work for you. It is safer to use +# "no", but you may want to experiment with "yes". "yes" is generally +# safe on Linux machines with the n_hdlc line discipline; unsafe on others. +SYNCHRONOUS=no + +# Do you want to clamp the MSS? Here's how to decide: +# - If you have only a SINGLE computer connected to the DSL modem, choose +# "no". +# - If you have a computer acting as a gateway for a LAN, choose "1412". +# The setting of 1412 is safe for either setup, but uses slightly more +# CPU power. +CLAMPMSS=1412 +#CLAMPMSS=no + +# LCP echo interval and failure count. +LCP_INTERVAL=20 +LCP_FAILURE=3 + +# PPPOE_TIMEOUT should be about 4*LCP_INTERVAL +PPPOE_TIMEOUT=80 + +# Firewalling: One of NONE, STANDALONE or MASQUERADE +FIREWALL=NONE + +# Linux kernel-mode plugin for pppd. If you want to try the kernel-mode +# plugin, use LINUX_PLUGIN=rp-pppoe.so +LINUX_PLUGIN= + +# Any extra arguments to pass to pppoe. Normally, use a blank string +# like this: +PPPOE_EXTRA="" + +# Rumour has it that "Citizen's Communications" with a 3Com +# HomeConnect DSL Modem DualLink requires these extra options: +# PPPOE_EXTRA="-f 3c12:3c13 -S ISP" + +# Any extra arguments to pass to pppd. Normally, use a blank string +# like this: +PPPD_EXTRA="" + + +########## DON'T CHANGE BELOW UNLESS YOU KNOW WHAT YOU ARE DOING +# If you wish to COMPLETELY overrride the pppd invocation: +# Example: +# OVERRIDE_PPPD_COMMAND="pppd call dsl" + +# If you want pppoe-connect to exit when connection drops: +# RETRY_ON_FAILURE=no diff --git a/rc.conf b/rc.conf index 8990bad0..07b2cf34 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/texmf/ls-R b/texmf/ls-R index 66ffaf37..7c91452d 100644 --- a/texmf/ls-R +++ b/texmf/ls-R @@ -66,8 +66,8 @@ language.texlive-langgerman.def 80jadetex.cnf ./updmap.d: -.keep_app-text_texlive-core-0 00updmap.cfg +.keep_app-text_texlive-core-0 texlive-basic.cfg texlive-context.cfg texlive-fontsextra.cfg @@ -85,8 +85,8 @@ texlive-pictures.cfg texlive-science.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 4278714a..c3b3556e 100644 --- a/xml/catalog +++ b/xml/catalog @@ -3,14 +3,6 @@ - - - - - - - - @@ -30,4 +22,12 @@ + + + + + + + +