]> Frank Brehm's Git Trees - config/samara/etc.git/commitdiff
Current state
authorFrank Brehm <frank.brehm@profitbricks.com>
Mon, 2 Feb 2015 12:49:09 +0000 (13:49 +0100)
committerFrank Brehm <frank.brehm@profitbricks.com>
Mon, 2 Feb 2015 12:49:09 +0000 (13:49 +0100)
66 files changed:
ImageMagick-6/delegates.xml
ImageMagick-6/policy.xml
ImageMagick-6/type.xml
conf.d/devfs [new file with mode: 0644]
conf.d/hwclock
conf.d/keymaps
conf.d/nfsclient [new file with mode: 0644]
conf.d/nfsmount [deleted file]
config-archive/etc/conf.d/hwclock.dist [new file with mode: 0644]
config-archive/etc/conf.d/hwclock.dist.new [deleted file]
config-archive/etc/conf.d/keymaps.dist [new file with mode: 0644]
config-archive/etc/conf.d/keymaps.dist.new [deleted file]
config-archive/etc/rc.conf
config-archive/etc/rc.conf.1 [new file with mode: 0644]
config-archive/etc/rc.conf.dist
cups/printers.conf
cups/printers.conf.O
exports.d/.keep_net-fs_nfs-utils-0 [new file with mode: 0644]
gconf/gconf.xml.defaults/%gconf-tree-de.xml
gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
gconf/gconf.xml.defaults/%gconf-tree-ru.xml
gconf/gconf.xml.defaults/%gconf-tree.xml
init.d/bootmisc
init.d/consolefont
init.d/devfs
init.d/dmesg
init.d/fsck
init.d/hostname
init.d/hwclock
init.d/keymaps
init.d/killprocs
init.d/local
init.d/localmount
init.d/loopback
init.d/modules
init.d/mount-ro
init.d/netmount
init.d/nfsclient [new file with mode: 0755]
init.d/nfsmount [deleted file]
init.d/numlock
init.d/procfs
init.d/root
init.d/savecache
init.d/swap
init.d/swapfiles
init.d/swclock
init.d/sysctl
init.d/sysfs
init.d/termencoding
init.d/tmpfiles.dev
init.d/tmpfiles.setup
init.d/udev
init.d/udev-mount [deleted file]
init.d/urandom
init.d/xdm
portage/savedconfig/sys-apps/busybox-1.23.0 [new file with mode: 0644]
ppp/firewall-masq [new file with mode: 0644]
ppp/firewall-standalone [new file with mode: 0644]
ppp/plugins/README [new file with mode: 0644]
ppp/plugins/rp-pppoe.so [new symlink]
ppp/pppoe-server-options [new file with mode: 0644]
ppp/pppoe.conf [new file with mode: 0644]
rc.conf
texmf/ls-R
xml/catalog
xml/docbook

index 855352e0eea3084a9f38ce30332286c644babf57..f838a0e5e67ccdda88152011d080f83754a8f4c3 100644 (file)
@@ -69,6 +69,8 @@
 -->
 <delegatemap>
   <delegate decode="autotrace" stealth="True" command="&quot;convert&quot; &quot;%i&quot; &quot;pnm:%u&quot;\n&quot;autotrace&quot; -input-format pnm -output-format svg -output-file &quot;%o&quot; &quot;%u&quot;"/>
+  <delegate decode="bpg" command="&quot;bpgdec&quot; -b 16 -o &quot;%o.png&quot; &quot;%i&quot;; mv &quot;%o.png&quot; &quot;%o&quot;"/>
+  <delegate decode="png" encode="bpg" command="&quot;bpgenc&quot; -b 12 -o &quot;%o&quot; &quot;%i&quot;"/>
   <delegate decode="blender" command="&quot;blender&quot; -b &quot;%i&quot; -F PNG -o &quot;%o&quot;&quot;\n&quot;convert&quot; -concatenate &quot;%o*.png&quot; &quot;%o&quot;"/>
   <delegate decode="browse" stealth="True" spawn="True" command="&quot;xdg-open&quot; http://www.imagemagick.org/; rm &quot;%i&quot;"/>
   <delegate decode="cdr" command="&quot;uniconvertor&quot; &quot;%i&quot; &quot;%o.svg&quot;; mv &quot;%o.svg&quot; &quot;%o&quot;"/>
   <delegate decode="shtml" command="&quot;html2ps&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
   <delegate decode="sid" command="&quot;mrsidgeodecode&quot; -if sid -i &quot;%i&quot; -of tif -o &quot;%o&quot; &gt; &quot;%u&quot;"/>
   <delegate decode="svg" command="&quot;rsvg-convert&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
-  <delegate decode="svg:decode" stealth="True" command="&quot;inkscape&quot; &quot;%s&quot; --export-eps=&quot;%s&quot; --export-dpi=&quot;%s&quot; --export-background=&quot;%s&quot; --export-background-opacity=&quot;%s&quot; &gt; &quot;%s&quot; 2&gt;&amp;1"/>
+  <delegate decode="svg:decode" stealth="True" command="&quot;inkscape&quot; &quot;%s&quot; --export-png=&quot;%s&quot; --export-dpi=&quot;%s&quot; --export-background=&quot;%s&quot; --export-background-opacity=&quot;%s&quot; &gt; &quot;%s&quot; 2&gt;&amp;1"/>
   <delegate decode="tiff" encode="launch" mode="encode" command="&quot;gimp&quot; &quot;%i&quot;"/>
   <delegate decode="txt" encode="ps" mode="bi" command="&quot;enscript&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
   <delegate decode="wdp" command="mv &quot;%i&quot; &quot;%i.jxr&quot;; &quot;JxrDecApp&quot; -i &quot;%i.jxr&quot; -o &quot;%o.bmp&quot;; mv &quot;%i.jxr&quot; &quot;%i&quot;; mv &quot;%o.bmp&quot; &quot;%o&quot;"/>
index e4908b1f8fea1645ca01062c6c36def603f55820..16e279032516153767c74199e31cc29b766741f7 100644 (file)
 
     <policy domain="resource" name="area" value="1GB"/>
 
-  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).
 -->
 <policymap>
   <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
   <!-- <policy domain="resource" name="memory" value="2GiB"/> -->
   <!-- <policy domain="resource" name="map" value="4GiB"/> -->
+  <!-- <policy domain="resource" name="width" value="100MP"/> -->
+  <!-- <policy domain="resource" name="height" value="100MP"/> -->
   <!-- <policy domain="resource" name="area" value="1GB"/> -->
   <!-- <policy domain="resource" name="disk" value="16EB"/> -->
   <!-- <policy domain="resource" name="file" value="768"/> -->
index 9197be47bcf86b97d7cdf65130c5d5d16dba64a0..6a8ee9dfd7d519daf70eb4457e6a091a9a2875d6 100644 (file)
@@ -17,5 +17,5 @@
 <!ATTLIST include file CDATA #REQUIRED>
 ]>
 <typemap>
-   <include file="type-dejavu.xml" /> <include file="type-windows.xml" /> <include file="type-ghostscript.xml" />
+   <include file="type-dejavu.xml" /> <include file="type-ghostscript.xml" /> <include file="type-windows.xml" />
 </typemap>
diff --git a/conf.d/devfs b/conf.d/devfs
new file mode 100644 (file)
index 0000000..51f8037
--- /dev/null
@@ -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"
index db790a26f653220d117c829691fb108a61a5f128..9313f752edefffe79f3d10d748906e6d9bd3fb8c 100644 (file)
@@ -7,9 +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.
-clock_hctosys="YES"
+# However, you can set this to "NO" if you are running a modern kernel
+# and using NTP to synchronize your system clock.
+clock_hctosys="NO"
 
 # If you do not want to set the hardware clock to the current system
 # time (software clock) during shutdown, set this to no.
index ee4298e332ea29e4d3887291da4aaa2bb01fbe48..7bf981e60bea174ca01bd0e32763cdd4b63a7970 100644 (file)
@@ -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/conf.d/nfsclient b/conf.d/nfsclient
new file mode 100644 (file)
index 0000000..d885b63
--- /dev/null
@@ -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 (file)
index 4183536..0000000
+++ /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.dist b/config-archive/etc/conf.d/hwclock.dist
new file mode 100644 (file)
index 0000000..ce9b40a
--- /dev/null
@@ -0,0 +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
+# you should set it to "local".
+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" 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
+# time (software clock) during shutdown, set this to no.
+#clock_systohc="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.new b/config-archive/etc/conf.d/hwclock.dist.new
deleted file mode 100644 (file)
index 59bb732..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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 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 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/keymaps.dist b/config-archive/etc/conf.d/keymaps.dist
new file mode 100644 (file)
index 0000000..e454433
--- /dev/null
@@ -0,0 +1,23 @@
+# Use keymap to specify the default console keymap.  There is a complete tree
+# of keymaps in /usr/share/keymaps to choose from.
+keymap="us"
+
+# 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.new b/config-archive/etc/conf.d/keymaps.dist.new
deleted file mode 100644 (file)
index 35d5b89..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# Use keymap to specify the default console keymap.  There is a complete tree
-# of keymaps in /usr/share/keymaps to choose from.
-keymap="us"
-
-# 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"
index b1b3448f7c2a797619495bd0f09db838d65a85c9..fba55d331bf5f5af3e42afa08259266d18e07ea6 100644 (file)
@@ -81,6 +81,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
@@ -102,7 +106,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"
@@ -154,10 +158,59 @@ unicode="YES"
 # 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/<service>.
+# To perform this cleanup manually for a stopped service, you can
+# execute cgroup_cleanup with /etc/init.d/<service> cgroup_cleanup or
+# rc-service <service> cgroup_cleanup.
+# rc_cgroup_cleanup="NO"
diff --git a/config-archive/etc/rc.conf.1 b/config-archive/etc/rc.conf.1
new file mode 100644 (file)
index 0000000..b1b3448
--- /dev/null
@@ -0,0 +1,163 @@
+# 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"
+
+# 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.
+# 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.
+#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"
+
+# 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"
+
+##############################################################################
+# 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 used.
+#
+# 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
+
+# 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.
+#rc_controller_cgroups="YES"
index ec1c4a462d68684a01c63dd94cb877f474bf014e..0970fb9b90f3579f068ec65b6151a5d659d02f1d 100644 (file)
@@ -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
index 32ebb714ebb43def939d685ee3d75ae760bd5c93..65f1eaa086a10dbf89f197aaf25dce072813475d 100644 (file)
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.7.5
-# Written by cupsd on 2015-01-12 17:44
+# Written by cupsd on 2015-01-28 14:56
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter Dcops_printer_Dell>
 UUID urn:uuid:c6594846-31d0-3260-51cb-c02cd7a18ef8
@@ -8,7 +8,7 @@ Info Printer Dcops - Dell B2375dnf Mono MFP
 Location Dcops
 DeviceURI ipp://192.168.88.100/ipp/print
 State Idle
-StateTime 1421081041
+StateTime 1422453367
 Type 8392788
 Accepting Yes
 Shared No
@@ -19,12 +19,12 @@ KLimit 0
 OpPolicy default
 ErrorPolicy stop-printer
 Attribute marker-colors \#FFFFFF
-Attribute marker-levels 97
+Attribute marker-levels 90
 Attribute marker-low-levels 5
 Attribute marker-high-levels 100
 Attribute marker-names Black Toner Cartridge
 Attribute marker-types toner
-Attribute marker-change-time 1421081040
+Attribute marker-change-time 1422453320
 </Printer>
 <Printer Dell_2350dn_Laser_Printer>
 UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be
index db02cb8bd28f5940fddea8167e85a1377664a9d0..8b6c839fde221e2b4723ca5895b589223423bd45 100644 (file)
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.7.5
-# Written by cupsd on 2015-01-12 17:43
+# Written by cupsd on 2015-01-28 14:55
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <DefaultPrinter Dcops_printer_Dell>
 UUID urn:uuid:c6594846-31d0-3260-51cb-c02cd7a18ef8
@@ -8,7 +8,7 @@ Info Printer Dcops - Dell B2375dnf Mono MFP
 Location Dcops
 DeviceURI ipp://192.168.88.100/ipp/print
 State Idle
-StateTime 1421081020
+StateTime 1422453320
 Type 8392788
 Accepting Yes
 Shared No
@@ -19,12 +19,12 @@ KLimit 0
 OpPolicy default
 ErrorPolicy stop-printer
 Attribute marker-colors \#FFFFFF
-Attribute marker-levels 98
+Attribute marker-levels 90
 Attribute marker-low-levels 5
 Attribute marker-high-levels 100
 Attribute marker-names Black Toner Cartridge
 Attribute marker-types toner
-Attribute marker-change-time 1421081020
+Attribute marker-change-time 1422453320
 </Printer>
 <Printer Dell_2350dn_Laser_Printer>
 UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be
diff --git a/exports.d/.keep_net-fs_nfs-utils-0 b/exports.d/.keep_net-fs_nfs-utils-0
new file mode 100644 (file)
index 0000000..e69de29
index 5b18ce6370e4a854facd5661a1dfb8e3b4e9dfc3..681a691ca20f2cb50f2956e017adb9dd1819cada 100644 (file)
@@ -8434,13 +8434,13 @@ z.B. »Sans Italic 10«.</longdesc>
                                        </dir>
                                        <dir name="terminal">
                                                <entry name="exec_arg">
-                                                       <local_schema short_desc="Exec-Argument für Vorgabe-Terminal">
-                                                               <longdesc>Das an die Vorgabe-Terminal-Anwendung zu übergebende exec-Argument.</longdesc>
+                                                       <local_schema short_desc="Ausführungsargumente">
+                                                               <longdesc>Das zum Ausführen von Programmen im Terminal verwendete, vom Schlüssel »exec« festgelegte Argument.</longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="exec">
-                                                       <local_schema short_desc="Vorgabe-Terminal-Anwendung">
-                                                               <longdesc>Die Vorgabe-Terminal-Anwendung, die für Anwendungen verwendet wird, die ein Terminal erforderlich machen.</longdesc>
+                                                       <local_schema short_desc="Terminal-Anwendung">
+                                                               <longdesc>Zu verwendende Terminal-Anwendung beim Starten von Anwendungen, die ein Terminal benötigen.</longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
index 0cb50ebea9a3d06f3d2838f71466148f8224ab0f..889465ef2fbcb1776a8ba45f2971783002af02ba 100644 (file)
                                        </dir>
                                        <dir name="terminal">
                                                <entry name="exec_arg">
-                                                       <local_schema short_desc="Exec argument for default terminal">
-                                                               <longdesc>The exec argument to use for the default terminal application.</longdesc>
+                                                       <local_schema short_desc="Exec Arguments">
+                                                               <longdesc>Argument used to execute programs in the terminal defined by the &apos;exec&apos; key.</longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="exec">
-                                                       <local_schema short_desc="Default terminal application">
-                                                               <longdesc>The default terminal application to use for applications that require a terminal.</longdesc>
+                                                       <local_schema short_desc="Terminal application">
+                                                               <longdesc>Terminal program to use when starting applications that require one.</longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
index 179df633316aa151df75ad9edceb75bcb1306e18..6526cbebf7593407b9d0f3bad0145a7877706202 100644 (file)
                                        </dir>
                                        <dir name="terminal">
                                                <entry name="exec_arg">
-                                                       <local_schema short_desc="Аргумент exec для терминала по умолчанию">
-                                                               <longdesc>Аргумент exec, использующийся приложением терминала по умолчанию.</longdesc>
+                                                       <local_schema short_desc="Аргументы для ключа «exec»">
+                                                               <longdesc>Аргумент, используемый при запуске программ в терминале по ключу «exec».</longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="exec">
-                                                       <local_schema short_desc="Ð\9fÑ\80иложение Ñ\82еÑ\80минала Ð¿Ð¾ Ñ\83молÑ\87аниÑ\8e">
-                                                               <longdesc>Ð\9fÑ\80иложение Ñ\82еÑ\80минала, Ð¸Ñ\81полÑ\8cзÑ\83емое Ð¿Ð¾ Ñ\83молÑ\87аниÑ\8e Ð¿Ñ\80иложениÑ\8fми, Ð½Ñ\83ждаÑ\8eÑ\89имиÑ\81Ñ\8f Ð² Ñ\82еÑ\80минале.</longdesc>
+                                                       <local_schema short_desc="ТеÑ\80минал">
+                                                               <longdesc>ТеÑ\80минал, ÐºÐ¾Ñ\82оÑ\80Ñ\8bй Ð¸Ñ\81полÑ\8cзÑ\83еÑ\82Ñ\81Ñ\8f Ð´Ð»Ñ\8f Ð·Ð°Ð¿Ñ\83Ñ\81ка Ð½Ñ\83ждаÑ\8eÑ\89иÑ\85Ñ\81Ñ\8f Ð² Ð½Ñ\91м Ð¿Ñ\80иложений.</longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
index 731b8dd731f80dc04a33b064ca792804039af018..3a683b302ea2e71a9c2b04631d159a4e3aa8b949 100644 (file)
@@ -17108,13 +17108,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="sound">
-                                       <entry name="input_feedback_sounds" mtime="1362855474" type="schema" stype="bool" owner="gnome">
+                                       <entry name="input_feedback_sounds" mtime="1421877411" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Input feedback sounds">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Whether to play sounds on input events.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="theme_name" mtime="1362855474" type="schema" stype="string" owner="gnome">
+                                       <entry name="theme_name" mtime="1421877411" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Sound theme name">
                                                        <default type="string">
                                                                <stringvalue>freedesktop</stringvalue>
@@ -17122,26 +17122,26 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>The XDG sound theme to use for event sounds.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="event_sounds" mtime="1362855474" type="schema" stype="bool" owner="gnome">
+                                       <entry name="event_sounds" mtime="1421877411" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Sounds for events">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Whether to play sounds on user events.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="enable_esd" mtime="1362855474" type="schema" stype="bool" owner="gnome">
+                                       <entry name="enable_esd" mtime="1421877411" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Enable ESD">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Enable sound server startup.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="default_mixer_tracks" mtime="1362855474" type="schema" stype="list" owner="gnome" list_type="string">
+                                       <entry name="default_mixer_tracks" mtime="1421877411" type="schema" stype="list" owner="gnome" list_type="string">
                                                <local_schema locale="C" short_desc="Default mixer tracks">
                                                        <default type="list" ltype="string">
                                                        </default>
                                                        <longdesc>The default mixer tracks used by the multimedia key bindings.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="default_mixer_device" mtime="1362855474" type="schema" stype="string" owner="gnome">
+                                       <entry name="default_mixer_device" mtime="1421877411" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Default mixer device">
                                                        <default type="string">
                                                                <stringvalue></stringvalue>
@@ -17151,7 +17151,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="file-views">
-                                       <entry name="icon_theme" mtime="1362855474" type="schema" stype="string" owner="gnome">
+                                       <entry name="icon_theme" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="File Icon Theme">
                                                        <default type="string">
                                                                <stringvalue>crux_teal</stringvalue>
@@ -17161,13 +17161,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="thumbnail_cache">
-                                       <entry name="maximum_size" mtime="1362855474" type="schema" stype="int" owner="gnome">
+                                       <entry name="maximum_size" mtime="1421877410" type="schema" stype="int" owner="gnome">
                                                <local_schema locale="C" short_desc="">
                                                        <default type="int" value="512"/>
                                                        <longdesc>Maximum size of the thumbnail cache, in megabytes. Set to -1 to disable cleaning.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="maximum_age" mtime="1362855474" type="schema" stype="int" owner="gnome">
+                                       <entry name="maximum_age" mtime="1421877410" type="schema" stype="int" owner="gnome">
                                                <local_schema locale="C" short_desc="">
                                                        <default type="int" value="180"/>
                                                        <longdesc>Maximum age for thumbnails in the cache, in days. Set to -1 to disable cleaning.</longdesc>
@@ -17175,7 +17175,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="thumbnailers">
-                                       <entry name="disable_all" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="disable_all" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Disable all external thumbnailers">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Set to true to disable all external thumbnailer programs, independent on whether they are independently disabled/enabled.</longdesc>
@@ -17187,13 +17187,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -17203,13 +17201,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -17219,13 +17215,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18923,13 +18917,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18939,13 +18931,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18955,13 +18945,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18971,13 +18959,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18987,13 +18973,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19003,13 +18987,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19019,13 +19001,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19035,13 +19015,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19051,13 +19029,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19067,13 +19043,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19083,13 +19057,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19099,13 +19071,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19115,13 +19085,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19131,13 +19099,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19147,13 +19113,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19163,13 +19127,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19179,13 +19141,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19195,33 +19155,31 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>/usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1418734094" type="schema" stype="bool" owner="ufraw">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                </dir>
                                <dir name="interface">
-                                       <entry name="show_unicode_menu" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="show_unicode_menu" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Show the &apos;Unicode Control Character&apos; menu">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether the context menus of entries and text views 
         should offer to insert control characters.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="show_input_method_menu" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="show_input_method_menu" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Show the &apos;Input Methods&apos; menu">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether the context menus of entries and text views 
         should offer to change the input method.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="menubar_accel" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="menubar_accel" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Menubar accelerator">
                                                        <default type="string">
                                                                <stringvalue>F10</stringvalue>
@@ -19229,7 +19187,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Keyboard shortcut to open the menu bars.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="file_chooser_backend" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="file_chooser_backend" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Module for GtkFileChooser">
                                                        <default type="string">
                                                                <stringvalue>gio</stringvalue>
@@ -19239,19 +19197,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
        &quot;gtk+&quot;.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="status_bar_meter_on_right" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="status_bar_meter_on_right" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Status Bar on Right">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Whether to display a status bar meter on the right.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="use_custom_font" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="use_custom_font" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Use Custom Font">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Whether to use a custom font in gtk+ applications.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="monospace_font_name" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="monospace_font_name" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Monospace font">
                                                        <default type="string">
                                                                <stringvalue>Monospace 10</stringvalue>
@@ -19260,7 +19218,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
               in locations like terminals.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="document_font_name" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="document_font_name" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Document font">
                                                        <default type="string">
                                                                <stringvalue>Sans 10</stringvalue>
@@ -19268,7 +19226,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Name of the default font used for reading documents.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="gtk-im-module" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="gtk-im-module" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="GTK IM Module">
                                                        <default type="string">
                                                                <stringvalue></stringvalue>
@@ -19276,7 +19234,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Name of the input method module used by GTK+.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="gtk-im-status-style" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="gtk-im-status-style" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="GTK IM Status Style">
                                                        <default type="string">
                                                                <stringvalue>callback</stringvalue>
@@ -19284,7 +19242,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Name of the GTK+ input method Status Style used by gtk+.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="gtk-im-preedit-style" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="gtk-im-preedit-style" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="GTK IM Preedit Style">
                                                        <default type="string">
                                                                <stringvalue>callback</stringvalue>
@@ -19292,7 +19250,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Name of the GTK+ input method Preedit Style used by gtk+.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="font_name" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="font_name" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Default font">
                                                        <default type="string">
                                                                <stringvalue>Sans 10</stringvalue>
@@ -19300,7 +19258,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Name of the default font used by gtk+.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="gtk_key_theme" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="gtk_key_theme" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Gtk+ Theme">
                                                        <default type="string">
                                                                <stringvalue>Default</stringvalue>
@@ -19308,7 +19266,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Basename of the default theme used by gtk+.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="gtk_theme" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="gtk_theme" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Gtk+ Theme">
                                                        <default type="string">
                                                                <stringvalue>Adwaita</stringvalue>
@@ -19316,7 +19274,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Basename of the default theme used by gtk+.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="icon_theme" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="icon_theme" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Icon Theme">
                                                        <default type="string">
                                                                <stringvalue>gnome</stringvalue>
@@ -19324,19 +19282,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Icon theme to use for the panel, nautilus etc.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="cursor_blink_time" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                       <entry name="cursor_blink_time" mtime="1421877410" type="schema" stype="int" owner="gnome">
                                                <local_schema locale="C" short_desc="Cursor Blink Time">
                                                        <default type="int" value="1200"/>
                                                        <longdesc>Length of the cursor blink cycle, in milliseconds.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="cursor_blink" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="cursor_blink" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Cursor Blink">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether the cursor should blink.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="toolbar_icons_size" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="toolbar_icons_size" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Toolbar Icon Size">
                                                        <default type="string">
                                                                <stringvalue>large-toolbar</stringvalue>
@@ -19345,31 +19303,31 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
         &quot;large-toolbar&quot;.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="toolbar_detachable" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="toolbar_detachable" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Toolbar Detachable">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Whether the user can detach toolbars and move them around.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="menubar_detachable" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="menubar_detachable" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Menubar Detachable">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Whether the user can detach menubars and move them around.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="buttons_have_icons" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="buttons_have_icons" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Buttons Have Icons">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Whether buttons may display an icon in addition to the button text.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="menus_have_icons" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="menus_have_icons" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Menus Have Icons">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether menus may display an icon next to a menu entry.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="toolbar_style" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="toolbar_style" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Toolbar Style">
                                                        <default type="string">
                                                                <stringvalue>both-horiz</stringvalue>
@@ -19378,20 +19336,20 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
        &quot;text&quot;.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="can_change_accels" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="can_change_accels" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Can Change Accels">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Whether the user can dynamically type a new accelerator when 
        positioned over an active menuitem.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="menus_have_tearoff" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="menus_have_tearoff" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Menus Have Tearoff">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Whether menus should have a tearoff.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="enable_animations" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="enable_animations" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Enable Animations">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Whether animations should be displayed. Note: This is a global
@@ -19399,7 +19357,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
        </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="accessibility" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="accessibility" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Enable Accessibility">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Whether Applications should have accessibility support.</longdesc>
@@ -19407,7 +19365,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="background">
-                                       <entry name="color_shading_type" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="color_shading_type" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Color Shading Type">
                                                        <default type="string">
                                                                <stringvalue>solid</stringvalue>
@@ -19415,7 +19373,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>How to shade the background color. Possible values are &quot;horizontal-gradient&quot;, &quot;vertical-gradient&quot;, and &quot;solid&quot;.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="secondary_color" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="secondary_color" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Secondary Color">
                                                        <default type="string">
                                                                <stringvalue>#66ba00</stringvalue>
@@ -19423,7 +19381,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Right or Bottom color when drawing gradients, not used for solid color.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="primary_color" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="primary_color" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Primary Color">
                                                        <default type="string">
                                                                <stringvalue>#66ba00</stringvalue>
@@ -19431,13 +19389,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>Left or Top color when drawing gradients, or the solid color.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="picture_opacity" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                       <entry name="picture_opacity" mtime="1421877410" type="schema" stype="int" owner="gnome">
                                                <local_schema locale="C" short_desc="Picture Opacity">
                                                        <default type="int" value="100"/>
                                                        <longdesc>Opacity with which to draw the background picture.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="picture_filename" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="picture_filename" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Picture Filename">
                                                        <default type="string">
                                                                <stringvalue>/usr/share/pixmaps/backgrounds/gnome/gentoo/gentoo-emergence.png</stringvalue>
@@ -19445,7 +19403,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        <longdesc>File to use for the background image.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="picture_options" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                       <entry name="picture_options" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="Picture Options">
                                                        <default type="string">
                                                                <stringvalue>zoom</stringvalue>
@@ -19455,7 +19413,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
     &quot;stretched&quot;, &quot;zoom&quot;, &quot;spanned&quot;.</longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="draw_background" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="draw_background" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Draw Desktop Background">
                                                        <default type="bool" value="true"/>
                                                        <longdesc>Have GNOME draw the desktop background.</longdesc>
@@ -19463,7 +19421,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="typing_break">
-                                       <entry name="enabled" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="enabled" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Whether or not keyboard locking is enabled">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>
@@ -19471,7 +19429,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
          </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="allow_postpone" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="allow_postpone" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Allow postponing of breaks">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>
@@ -19479,7 +19437,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
          </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="break_time" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                       <entry name="break_time" mtime="1421877410" type="schema" stype="int" owner="gnome">
                                                <local_schema locale="C" short_desc="Break time">
                                                        <default type="int" value="3"/>
                                                        <longdesc>
@@ -19487,7 +19445,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
          </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="type_time" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                       <entry name="type_time" mtime="1421877410" type="schema" stype="int" owner="gnome">
                                                <local_schema locale="C" short_desc="Type time">
                                                        <default type="int" value="60"/>
                                                        <longdesc>
@@ -19497,7 +19455,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </entry>
                                </dir>
                                <dir name="lockdown">
-                                       <entry name="disable_application_handlers" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="disable_application_handlers" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Disable URL and MIME type handlers">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>
@@ -19505,7 +19463,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
         </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="disable_lock_screen" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="disable_lock_screen" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Disable lock screen">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>
@@ -19513,7 +19471,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
         </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="disable_user_switching" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="disable_user_switching" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Disable user switching">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>
@@ -19522,7 +19480,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
         </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="disable_print_setup" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="disable_print_setup" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Disable print setup">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>
@@ -19532,7 +19490,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
         </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="disable_printing" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="disable_printing" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Disable printing">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>
@@ -19541,7 +19499,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
         </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="disable_save_to_disk" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="disable_save_to_disk" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Disable saving files to disk">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>
@@ -19551,7 +19509,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
         </longdesc>
                                                </local_schema>
                                        </entry>
-                                       <entry name="disable_command_line" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                       <entry name="disable_command_line" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                <local_schema locale="C" short_desc="Disable command line">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>
@@ -19607,28 +19565,28 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="keyboard">
-                                               <entry name="remember_numlock_state" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="remember_numlock_state" mtime="1421877409" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="Remember NumLock state">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>When set to true, GNOME will remember the state of the NumLock LED between sessions.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="bell_custom_file" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                               <entry name="bell_custom_file" mtime="1421877409" type="schema" stype="string" owner="gnome">
                                                        <local_schema locale="C" short_desc="Keyboard Bell Custom Filename">
                                                                <longdesc>File name of the bell sound to be played.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="bell_duration" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                               <entry name="bell_duration" mtime="1421877409" type="schema" stype="int" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="int" value="100"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="bell_pitch" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                               <entry name="bell_pitch" mtime="1421877409" type="schema" stype="int" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="int" value="400"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="bell_mode" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                               <entry name="bell_mode" mtime="1421877409" type="schema" stype="string" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="string">
                                                                        <stringvalue>on</stringvalue>
@@ -19636,27 +19594,27 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>possible values are &quot;on&quot;, &quot;off&quot;, and &quot;custom&quot;.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="click_volume" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                               <entry name="click_volume" mtime="1421877409" type="schema" stype="int" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="int" value="0"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="delay" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                               <entry name="delay" mtime="1421877409" type="schema" stype="int" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="int" value="500"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="rate" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                               <entry name="rate" mtime="1421877409" type="schema" stype="int" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="int" value="30"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="click" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="click" mtime="1421877409" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="repeat" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="repeat" mtime="1421877409" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
                                                        </local_schema>
@@ -19818,7 +19776,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </dir>
                                        </dir>
                                        <dir name="mouse">
-                                               <entry name="cursor_size" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                               <entry name="cursor_size" mtime="1421877409" type="schema" stype="int" owner="gnome">
                                                        <local_schema locale="C" short_desc="Cursor size">
                                                                <default type="int" value="18"/>
                                                                <longdesc>
@@ -19826,7 +19784,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
        </longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="cursor_theme" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                               <entry name="cursor_theme" mtime="1421877409" type="schema" stype="string" owner="gnome">
                                                        <local_schema locale="C" short_desc="Cursor theme">
                                                                <longdesc>
          Cursor theme name. Used only by Xservers that support Xcursor,
@@ -19834,7 +19792,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
        </longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="cursor_font" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                               <entry name="cursor_font" mtime="1421877409" type="schema" stype="string" owner="gnome">
                                                        <local_schema locale="C" short_desc="Cursor font">
                                                                <longdesc>
          Font name of the cursor. If unset, the default font is
@@ -19844,26 +19802,26 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
        </longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="locate_pointer" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="locate_pointer" mtime="1421877409" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="Locate Pointer">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>Highlights the current location of the pointer when the
         Control key is pressed and released.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="double_click" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                               <entry name="double_click" mtime="1421877409" type="schema" stype="int" owner="gnome">
                                                        <local_schema locale="C" short_desc="Double Click Time">
                                                                <default type="int" value="400"/>
                                                                <longdesc>Length of a double click.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="drag_threshold" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                               <entry name="drag_threshold" mtime="1421877409" type="schema" stype="int" owner="gnome">
                                                        <local_schema locale="C" short_desc="Drag Threshold">
                                                                <default type="int" value="8"/>
                                                                <longdesc>Distance before a drag is started.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="motion_threshold" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                               <entry name="motion_threshold" mtime="1421877409" type="schema" stype="int" owner="gnome">
                                                        <local_schema locale="C" short_desc="Motion Threshold">
                                                                <default type="int" value="-1"/>
                                                                <longdesc>Distance in pixels the pointer must move before
@@ -19871,20 +19829,20 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
         system default.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="motion_acceleration" mtime="1362855473" type="schema" stype="float" owner="gnome">
+                                               <entry name="motion_acceleration" mtime="1421877409" type="schema" stype="float" owner="gnome">
                                                        <local_schema locale="C" short_desc="Single Click">
                                                                <default type="float" value="-1"/>
                                                                <longdesc>Acceleration multiplier for mouse motion.  A value of -1
         is the system default.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="single_click" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="single_click" mtime="1421877409" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="Single Click">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>Single click to open icons.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="left_handed" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="left_handed" mtime="1421877409" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="Mouse button orientation">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>Swap left and right mouse buttons for left-handed mice.</longdesc>
@@ -19894,116 +19852,116 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                </dir>
                                <dir name="accessibility">
                                        <dir name="keyboard">
-                                               <entry name="togglekeys_enable" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="togglekeys_enable" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="stickykeys_modifier_beep" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="stickykeys_modifier_beep" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>Beep when a modifier is pressed.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="stickykeys_two_key_off" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="stickykeys_two_key_off" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>Disable if two keys are pressed at the same time.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="stickykeys_enable" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="stickykeys_enable" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="slowkeys_beep_reject" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="slowkeys_beep_reject" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="slowkeys_beep_accept" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="slowkeys_beep_accept" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="slowkeys_beep_press" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="slowkeys_beep_press" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="slowkeys_delay" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                               <entry name="slowkeys_delay" mtime="1421877410" type="schema" stype="int" owner="gnome">
                                                        <local_schema locale="C" short_desc="Minimum interval in milliseconds">
                                                                <default type="int" value="300"/>
                                                                <longdesc>Do not accept a key as being pressed unless held for @delay milliseconds.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="slowkeys_enable" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="slowkeys_enable" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="mousekeys_init_delay" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                               <entry name="mousekeys_init_delay" mtime="1421877410" type="schema" stype="int" owner="gnome">
                                                        <local_schema locale="C" short_desc="Initial delay in milliseconds">
                                                                <default type="int" value="300"/>
                                                                <longdesc>How many milliseconds to wait before mouse movement keys start to operate.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="mousekeys_accel_time" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                               <entry name="mousekeys_accel_time" mtime="1421877410" type="schema" stype="int" owner="gnome">
                                                        <local_schema locale="C" short_desc="How long to accelerate in milliseconds">
                                                                <default type="int" value="300"/>
                                                                <longdesc>How many milliseconds it takes to go from 0 to maximum speed.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="mousekeys_max_speed" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                               <entry name="mousekeys_max_speed" mtime="1421877410" type="schema" stype="int" owner="gnome">
                                                        <local_schema locale="C" short_desc="Pixels per seconds">
                                                                <default type="int" value="10"/>
                                                                <longdesc>How many pixels per second to move at the maximum speed.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="mousekeys_enable" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="mousekeys_enable" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="bouncekeys_beep_reject" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="bouncekeys_beep_reject" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="bouncekeys_delay" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                               <entry name="bouncekeys_delay" mtime="1421877410" type="schema" stype="int" owner="gnome">
                                                        <local_schema locale="C" short_desc="minimum interval in milliseconds">
                                                                <default type="int" value="300"/>
                                                                <longdesc>Ignore multiple presses of the _same_ key within @delay milliseconds.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="bouncekeys_enable" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="bouncekeys_enable" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="timeout" mtime="1362855473" type="schema" stype="int" owner="gnome">
+                                               <entry name="timeout" mtime="1421877410" type="schema" stype="int" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="int" value="200"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="timeout_enable" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="timeout_enable" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="feature_state_change_beep" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="feature_state_change_beep" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enable" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="enable" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="false"/>
                                                        </local_schema>
                                                </entry>
                                        </dir>
                                        <dir name="startup">
-                                               <entry name="exec_ats" mtime="1362855473" type="schema" stype="list" owner="gnome" list_type="string">
+                                               <entry name="exec_ats" mtime="1421877409" type="schema" stype="list" owner="gnome" list_type="string">
                                                        <local_schema locale="C" short_desc="Startup Assistive Technology Applications">
                                                                <default type="list" ltype="string">
                                                                </default>
@@ -20602,19 +20560,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                </dir>
                                <dir name="applications">
                                        <dir name="browser">
-                                               <entry name="nremote" mtime="1362855474" type="schema" stype="bool" owner="gnome">
+                                               <entry name="nremote" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="Browser understands remote">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>Whether the default browser understands netscape remote.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="needs_term" mtime="1362855474" type="schema" stype="bool" owner="gnome">
+                                               <entry name="needs_term" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="Browser needs terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>Whether the default browser needs a terminal to run.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="exec" mtime="1362855474" type="schema" stype="string" owner="gnome">
+                                               <entry name="exec" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                        <local_schema locale="C" short_desc="Default browser">
                                                                <default type="string">
                                                                        <stringvalue>mozilla</stringvalue>
@@ -20649,13 +20607,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        </local_schema>
                                                </entry>
                                                <dir name="mobility">
-                                                       <entry name="startup" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                                       <entry name="startup" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                                <local_schema locale="C" short_desc="Start preferred Mobility assistive technology application">
                                                                        <default type="bool" value="false"/>
                                                                        <longdesc>GNOME to start preferred Mobility assistive technology application during login.</longdesc>
                                                                </local_schema>
                                                        </entry>
-                                                       <entry name="exec" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                                       <entry name="exec" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                                <local_schema locale="C" short_desc="Preferred Mobility assistive technology application">
                                                                        <default type="string">
                                                                                <stringvalue>dasher</stringvalue>
@@ -20665,13 +20623,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                        </entry>
                                                </dir>
                                                <dir name="visual">
-                                                       <entry name="startup" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                                       <entry name="startup" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                                <local_schema locale="C" short_desc="Start preferred Visual assistive technology application">
                                                                        <default type="bool" value="false"/>
                                                                        <longdesc>GNOME to start preferred Visual assistive technology application during login.</longdesc>
                                                                </local_schema>
                                                        </entry>
-                                                       <entry name="exec" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                                       <entry name="exec" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                                <local_schema locale="C" short_desc="Preferred Visual assistive technology application">
                                                                        <default type="string">
                                                                                <stringvalue>orca</stringvalue>
@@ -20682,13 +20640,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </dir>
                                        </dir>
                                        <dir name="tasks">
-                                               <entry name="needs_term" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="needs_term" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="Tasks needs terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>Whether the default tasks application needs a terminal to run</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="exec" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                               <entry name="exec" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                        <local_schema locale="C" short_desc="Default tasks">
                                                                <default type="string">
                                                                        <stringvalue>evolution</stringvalue>
@@ -20698,13 +20656,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="calendar">
-                                               <entry name="needs_term" mtime="1362855473" type="schema" stype="bool" owner="gnome">
+                                               <entry name="needs_term" mtime="1421877410" type="schema" stype="bool" owner="gnome">
                                                        <local_schema locale="C" short_desc="Calendar needs terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>Whether the default calendar application needs a terminal to run</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="exec" mtime="1362855473" type="schema" stype="string" owner="gnome">
+                                               <entry name="exec" mtime="1421877410" type="schema" stype="string" owner="gnome">
                                                        <local_schema locale="C" short_desc="Default calendar">
                                                                <default type="string">
                                                                        <stringvalue>evolution</stringvalue>
@@ -20714,7 +20672,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="window_manager">
-                                               <entry name="workspace_names" mtime="1362855472" type="schema" stype="list" owner="gnome" list_type="string">
+                                               <entry name="workspace_names" mtime="1421877409" type="schema" stype="list" owner="gnome" list_type="string">
                                                        <local_schema locale="C" short_desc="Names of the workspaces (deprecated)">
                                                                <longdesc>
           A list with names of the first window manager workspaces.
@@ -20722,7 +20680,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
         </longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="number_of_workspaces" mtime="1362855472" type="schema" stype="int" owner="gnome">
+                                               <entry name="number_of_workspaces" mtime="1421877409" type="schema" stype="int" owner="gnome">
                                                        <local_schema locale="C" short_desc="The number of workspaces (deprecated)">
                                                                <longdesc>
           The number of workspaces the window manager should use
@@ -20730,7 +20688,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
         </longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="current" mtime="1362855472" type="schema" stype="string" owner="gnome">
+                                               <entry name="current" mtime="1421877409" type="schema" stype="string" owner="gnome">
                                                        <local_schema locale="C" short_desc="User window manager (deprecated)">
                                                                <longdesc>
           Window manager to try first.
@@ -20738,7 +20696,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
         </longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="default" mtime="1362855472" type="schema" stype="string" owner="gnome">
+                                               <entry name="default" mtime="1421877409" type="schema" stype="string" owner="gnome">
                                                        <local_schema locale="C" short_desc="Fallback window manager (deprecated)">
                                                                <longdesc>
           Fallback window manager if user window manager can&apos;t be found.
@@ -20758,20 +20716,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="terminal">
-                                               <entry name="exec_arg" mtime="1416959236" type="schema" stype="string" owner="gnome-vfs">
-                                                       <local_schema locale="C" short_desc="Exec argument for default terminal">
+                                               <entry name="exec_arg" mtime="1421877410" type="schema" stype="string" owner="gnome">
+                                                       <local_schema locale="C" short_desc="Exec Arguments">
                                                                <default type="string">
                                                                        <stringvalue>-x</stringvalue>
                                                                </default>
-                                                               <longdesc>The exec argument to use for the default terminal application.</longdesc>
+                                                               <longdesc>Argument used to execute programs in the terminal defined
+       by the &apos;exec&apos; key.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="exec" mtime="1416959236" type="schema" stype="string" owner="gnome-vfs">
-                                                       <local_schema locale="C" short_desc="Default terminal application">
+                                               <entry name="exec" mtime="1421877410" type="schema" stype="string" owner="gnome">
+                                                       <local_schema locale="C" short_desc="Terminal application">
                                                                <default type="string">
                                                                        <stringvalue>gnome-terminal</stringvalue>
                                                                </default>
-                                                               <longdesc>The default terminal application to use for applications that require a terminal.</longdesc>
+                                                               <longdesc>Terminal program to use when starting applications that require one.</longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -20890,25 +20849,25 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                </dir>
                        </dir>
                        <dir name="sound">
-                               <entry name="input_feedback_sounds" mtime="1362855474" schema="/schemas/desktop/gnome/sound/input_feedback_sounds"/>
-                               <entry name="theme_name" mtime="1362855474" schema="/schemas/desktop/gnome/sound/theme_name"/>
-                               <entry name="event_sounds" mtime="1362855474" schema="/schemas/desktop/gnome/sound/event_sounds"/>
-                               <entry name="enable_esd" mtime="1362855474" schema="/schemas/desktop/gnome/sound/enable_esd"/>
-                               <entry name="default_mixer_tracks" mtime="1362855474" schema="/schemas/desktop/gnome/sound/default_mixer_tracks"/>
-                               <entry name="default_mixer_device" mtime="1362855474" schema="/schemas/desktop/gnome/sound/default_mixer_device"/>
+                               <entry name="input_feedback_sounds" mtime="1421877411" schema="/schemas/desktop/gnome/sound/input_feedback_sounds"/>
+                               <entry name="theme_name" mtime="1421877411" schema="/schemas/desktop/gnome/sound/theme_name"/>
+                               <entry name="event_sounds" mtime="1421877411" schema="/schemas/desktop/gnome/sound/event_sounds"/>
+                               <entry name="enable_esd" mtime="1421877411" schema="/schemas/desktop/gnome/sound/enable_esd"/>
+                               <entry name="default_mixer_tracks" mtime="1421877411" schema="/schemas/desktop/gnome/sound/default_mixer_tracks"/>
+                               <entry name="default_mixer_device" mtime="1421877411" schema="/schemas/desktop/gnome/sound/default_mixer_device"/>
                        </dir>
                        <dir name="file_views">
                                <entry name="tabs_open_position" mtime="1362855854" schema="/schemas/desktop/gnome/file_views/tabs_open_position"/>
                                <entry name="show_backup_files" mtime="1362855854" schema="/schemas/desktop/gnome/file_views/show_backup_files"/>
                                <entry name="show_hidden_files" mtime="1362855854" schema="/schemas/desktop/gnome/file_views/show_hidden_files"/>
-                               <entry name="icon_theme" mtime="1362855474" schema="/schemas/desktop/gnome/file-views/icon_theme"/>
+                               <entry name="icon_theme" mtime="1421877410" schema="/schemas/desktop/gnome/file-views/icon_theme"/>
                        </dir>
                        <dir name="thumbnail_cache">
-                               <entry name="maximum_size" mtime="1362855474" schema="/schemas/desktop/gnome/thumbnail_cache/maximum_size"/>
-                               <entry name="maximum_age" mtime="1362855473" schema="/schemas/desktop/gnome/thumbnail_cache/maximum_age"/>
+                               <entry name="maximum_size" mtime="1421877410" schema="/schemas/desktop/gnome/thumbnail_cache/maximum_size"/>
+                               <entry name="maximum_age" mtime="1421877410" schema="/schemas/desktop/gnome/thumbnail_cache/maximum_age"/>
                        </dir>
                        <dir name="thumbnailers">
-                               <entry name="disable_all" mtime="1362855473" schema="/schemas/desktop/gnome/thumbnailers/disable_all"/>
+                               <entry name="disable_all" mtime="1421877410" schema="/schemas/desktop/gnome/thumbnailers/disable_all"/>
                                <dir name="image@x-samsung-srw">
                                        <entry name="command" mtime="1418734094" schema="/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/command"/>
                                        <entry name="enable" mtime="1418734094" schema="/schemas/desktop/gnome/thumbnailers/image@x-samsung-srw/enable"/>
@@ -21467,57 +21426,57 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                </dir>
                        </dir>
                        <dir name="interface">
-                               <entry name="show_unicode_menu" mtime="1362855473" schema="/schemas/desktop/gnome/interface/show_unicode_menu"/>
-                               <entry name="show_input_method_menu" mtime="1362855473" schema="/schemas/desktop/gnome/interface/show_input_method_menu"/>
-                               <entry name="menubar_accel" mtime="1362855473" schema="/schemas/desktop/gnome/interface/menubar_accel"/>
-                               <entry name="file_chooser_backend" mtime="1362855473" schema="/schemas/desktop/gnome/interface/file_chooser_backend"/>
-                               <entry name="status_bar_meter_on_right" mtime="1362855473" schema="/schemas/desktop/gnome/interface/status_bar_meter_on_right"/>
-                               <entry name="use_custom_font" mtime="1362855473" schema="/schemas/desktop/gnome/interface/use_custom_font"/>
-                               <entry name="monospace_font_name" mtime="1362855473" schema="/schemas/desktop/gnome/interface/monospace_font_name"/>
-                               <entry name="document_font_name" mtime="1362855473" schema="/schemas/desktop/gnome/interface/document_font_name"/>
-                               <entry name="gtk-im-module" mtime="1362855473" schema="/schemas/desktop/gnome/interface/gtk-im-module"/>
-                               <entry name="gtk-im-status-style" mtime="1362855473" schema="/schemas/desktop/gnome/interface/gtk-im-status-style"/>
-                               <entry name="gtk-im-preedit-style" mtime="1362855473" schema="/schemas/desktop/gnome/interface/gtk-im-preedit-style"/>
-                               <entry name="font_name" mtime="1362855473" schema="/schemas/desktop/gnome/interface/font_name"/>
-                               <entry name="gtk_key_theme" mtime="1362855473" schema="/schemas/desktop/gnome/interface/gtk_key_theme"/>
-                               <entry name="gtk_theme" mtime="1362855473" schema="/schemas/desktop/gnome/interface/gtk_theme"/>
-                               <entry name="icon_theme" mtime="1362855473" schema="/schemas/desktop/gnome/interface/icon_theme"/>
-                               <entry name="cursor_blink_time" mtime="1362855473" schema="/schemas/desktop/gnome/interface/cursor_blink_time"/>
-                               <entry name="cursor_blink" mtime="1362855473" schema="/schemas/desktop/gnome/interface/cursor_blink"/>
-                               <entry name="toolbar_icons_size" mtime="1362855473" schema="/schemas/desktop/gnome/interface/toolbar_icons_size"/>
-                               <entry name="toolbar_detachable" mtime="1362855473" schema="/schemas/desktop/gnome/interface/toolbar_detachable"/>
-                               <entry name="menubar_detachable" mtime="1362855473" schema="/schemas/desktop/gnome/interface/menubar_detachable"/>
-                               <entry name="buttons_have_icons" mtime="1362855473" schema="/schemas/desktop/gnome/interface/buttons_have_icons"/>
-                               <entry name="menus_have_icons" mtime="1362855473" schema="/schemas/desktop/gnome/interface/menus_have_icons"/>
-                               <entry name="toolbar_style" mtime="1362855473" schema="/schemas/desktop/gnome/interface/toolbar_style"/>
-                               <entry name="can_change_accels" mtime="1362855473" schema="/schemas/desktop/gnome/interface/can_change_accels"/>
-                               <entry name="menus_have_tearoff" mtime="1362855473" schema="/schemas/desktop/gnome/interface/menus_have_tearoff"/>
-                               <entry name="enable_animations" mtime="1362855473" schema="/schemas/desktop/gnome/interface/enable_animations"/>
-                               <entry name="accessibility" mtime="1362855473" schema="/schemas/desktop/gnome/interface/accessibility"/>
+                               <entry name="show_unicode_menu" mtime="1421877410" schema="/schemas/desktop/gnome/interface/show_unicode_menu"/>
+                               <entry name="show_input_method_menu" mtime="1421877410" schema="/schemas/desktop/gnome/interface/show_input_method_menu"/>
+                               <entry name="menubar_accel" mtime="1421877410" schema="/schemas/desktop/gnome/interface/menubar_accel"/>
+                               <entry name="file_chooser_backend" mtime="1421877410" schema="/schemas/desktop/gnome/interface/file_chooser_backend"/>
+                               <entry name="status_bar_meter_on_right" mtime="1421877410" schema="/schemas/desktop/gnome/interface/status_bar_meter_on_right"/>
+                               <entry name="use_custom_font" mtime="1421877410" schema="/schemas/desktop/gnome/interface/use_custom_font"/>
+                               <entry name="monospace_font_name" mtime="1421877410" schema="/schemas/desktop/gnome/interface/monospace_font_name"/>
+                               <entry name="document_font_name" mtime="1421877410" schema="/schemas/desktop/gnome/interface/document_font_name"/>
+                               <entry name="gtk-im-module" mtime="1421877410" schema="/schemas/desktop/gnome/interface/gtk-im-module"/>
+                               <entry name="gtk-im-status-style" mtime="1421877410" schema="/schemas/desktop/gnome/interface/gtk-im-status-style"/>
+                               <entry name="gtk-im-preedit-style" mtime="1421877410" schema="/schemas/desktop/gnome/interface/gtk-im-preedit-style"/>
+                               <entry name="font_name" mtime="1421877410" schema="/schemas/desktop/gnome/interface/font_name"/>
+                               <entry name="gtk_key_theme" mtime="1421877410" schema="/schemas/desktop/gnome/interface/gtk_key_theme"/>
+                               <entry name="gtk_theme" mtime="1421877410" schema="/schemas/desktop/gnome/interface/gtk_theme"/>
+                               <entry name="icon_theme" mtime="1421877410" schema="/schemas/desktop/gnome/interface/icon_theme"/>
+                               <entry name="cursor_blink_time" mtime="1421877410" schema="/schemas/desktop/gnome/interface/cursor_blink_time"/>
+                               <entry name="cursor_blink" mtime="1421877410" schema="/schemas/desktop/gnome/interface/cursor_blink"/>
+                               <entry name="toolbar_icons_size" mtime="1421877410" schema="/schemas/desktop/gnome/interface/toolbar_icons_size"/>
+                               <entry name="toolbar_detachable" mtime="1421877410" schema="/schemas/desktop/gnome/interface/toolbar_detachable"/>
+                               <entry name="menubar_detachable" mtime="1421877410" schema="/schemas/desktop/gnome/interface/menubar_detachable"/>
+                               <entry name="buttons_have_icons" mtime="1421877410" schema="/schemas/desktop/gnome/interface/buttons_have_icons"/>
+                               <entry name="menus_have_icons" mtime="1421877410" schema="/schemas/desktop/gnome/interface/menus_have_icons"/>
+                               <entry name="toolbar_style" mtime="1421877410" schema="/schemas/desktop/gnome/interface/toolbar_style"/>
+                               <entry name="can_change_accels" mtime="1421877410" schema="/schemas/desktop/gnome/interface/can_change_accels"/>
+                               <entry name="menus_have_tearoff" mtime="1421877410" schema="/schemas/desktop/gnome/interface/menus_have_tearoff"/>
+                               <entry name="enable_animations" mtime="1421877410" schema="/schemas/desktop/gnome/interface/enable_animations"/>
+                               <entry name="accessibility" mtime="1421877410" schema="/schemas/desktop/gnome/interface/accessibility"/>
                        </dir>
                        <dir name="background">
-                               <entry name="color_shading_type" mtime="1362855473" schema="/schemas/desktop/gnome/background/color_shading_type"/>
-                               <entry name="secondary_color" mtime="1362855473" schema="/schemas/desktop/gnome/background/secondary_color"/>
-                               <entry name="primary_color" mtime="1362855473" schema="/schemas/desktop/gnome/background/primary_color"/>
-                               <entry name="picture_opacity" mtime="1362855473" schema="/schemas/desktop/gnome/background/picture_opacity"/>
-                               <entry name="picture_filename" mtime="1362855473" schema="/schemas/desktop/gnome/background/picture_filename"/>
-                               <entry name="picture_options" mtime="1362855473" schema="/schemas/desktop/gnome/background/picture_options"/>
-                               <entry name="draw_background" mtime="1362855473" schema="/schemas/desktop/gnome/background/draw_background"/>
+                               <entry name="color_shading_type" mtime="1421877410" schema="/schemas/desktop/gnome/background/color_shading_type"/>
+                               <entry name="secondary_color" mtime="1421877410" schema="/schemas/desktop/gnome/background/secondary_color"/>
+                               <entry name="primary_color" mtime="1421877410" schema="/schemas/desktop/gnome/background/primary_color"/>
+                               <entry name="picture_opacity" mtime="1421877410" schema="/schemas/desktop/gnome/background/picture_opacity"/>
+                               <entry name="picture_filename" mtime="1421877410" schema="/schemas/desktop/gnome/background/picture_filename"/>
+                               <entry name="picture_options" mtime="1421877410" schema="/schemas/desktop/gnome/background/picture_options"/>
+                               <entry name="draw_background" mtime="1421877410" schema="/schemas/desktop/gnome/background/draw_background"/>
                        </dir>
                        <dir name="typing_break">
-                               <entry name="enabled" mtime="1362855473" schema="/schemas/desktop/gnome/typing_break/enabled"/>
-                               <entry name="allow_postpone" mtime="1362855473" schema="/schemas/desktop/gnome/typing_break/allow_postpone"/>
-                               <entry name="break_time" mtime="1362855473" schema="/schemas/desktop/gnome/typing_break/break_time"/>
-                               <entry name="type_time" mtime="1362855473" schema="/schemas/desktop/gnome/typing_break/type_time"/>
+                               <entry name="enabled" mtime="1421877410" schema="/schemas/desktop/gnome/typing_break/enabled"/>
+                               <entry name="allow_postpone" mtime="1421877410" schema="/schemas/desktop/gnome/typing_break/allow_postpone"/>
+                               <entry name="break_time" mtime="1421877410" schema="/schemas/desktop/gnome/typing_break/break_time"/>
+                               <entry name="type_time" mtime="1421877410" schema="/schemas/desktop/gnome/typing_break/type_time"/>
                        </dir>
                        <dir name="lockdown">
-                               <entry name="disable_application_handlers" mtime="1362855473" schema="/schemas/desktop/gnome/lockdown/disable_application_handlers"/>
-                               <entry name="disable_lock_screen" mtime="1362855473" schema="/schemas/desktop/gnome/lockdown/disable_lock_screen"/>
-                               <entry name="disable_user_switching" mtime="1362855473" schema="/schemas/desktop/gnome/lockdown/disable_user_switching"/>
-                               <entry name="disable_print_setup" mtime="1362855473" schema="/schemas/desktop/gnome/lockdown/disable_print_setup"/>
-                               <entry name="disable_printing" mtime="1362855473" schema="/schemas/desktop/gnome/lockdown/disable_printing"/>
-                               <entry name="disable_save_to_disk" mtime="1362855473" schema="/schemas/desktop/gnome/lockdown/disable_save_to_disk"/>
-                               <entry name="disable_command_line" mtime="1362855473" schema="/schemas/desktop/gnome/lockdown/disable_command_line"/>
+                               <entry name="disable_application_handlers" mtime="1421877410" schema="/schemas/desktop/gnome/lockdown/disable_application_handlers"/>
+                               <entry name="disable_lock_screen" mtime="1421877410" schema="/schemas/desktop/gnome/lockdown/disable_lock_screen"/>
+                               <entry name="disable_user_switching" mtime="1421877410" schema="/schemas/desktop/gnome/lockdown/disable_user_switching"/>
+                               <entry name="disable_print_setup" mtime="1421877410" schema="/schemas/desktop/gnome/lockdown/disable_print_setup"/>
+                               <entry name="disable_printing" mtime="1421877410" schema="/schemas/desktop/gnome/lockdown/disable_printing"/>
+                               <entry name="disable_save_to_disk" mtime="1421877410" schema="/schemas/desktop/gnome/lockdown/disable_save_to_disk"/>
+                               <entry name="disable_command_line" mtime="1421877410" schema="/schemas/desktop/gnome/lockdown/disable_command_line"/>
                        </dir>
                        <dir name="peripherals">
                                <dir name="touchpad">
@@ -21531,16 +21490,16 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        <entry name="removal_action" mtime="1362854673" schema="/schemas/desktop/gnome/peripherals/smartcard/removal_action"/>
                                </dir>
                                <dir name="keyboard">
-                                       <entry name="remember_numlock_state" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/keyboard/remember_numlock_state"/>
-                                       <entry name="bell_custom_file" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/keyboard/bell_custom_file"/>
-                                       <entry name="bell_duration" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/keyboard/bell_duration"/>
-                                       <entry name="bell_pitch" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/keyboard/bell_pitch"/>
-                                       <entry name="bell_mode" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/keyboard/bell_mode"/>
-                                       <entry name="click_volume" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/keyboard/click_volume"/>
-                                       <entry name="delay" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/keyboard/delay"/>
-                                       <entry name="rate" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/keyboard/rate"/>
-                                       <entry name="click" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/keyboard/click"/>
-                                       <entry name="repeat" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/keyboard/repeat"/>
+                                       <entry name="remember_numlock_state" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/keyboard/remember_numlock_state"/>
+                                       <entry name="bell_custom_file" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/keyboard/bell_custom_file"/>
+                                       <entry name="bell_duration" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/keyboard/bell_duration"/>
+                                       <entry name="bell_pitch" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/keyboard/bell_pitch"/>
+                                       <entry name="bell_mode" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/keyboard/bell_mode"/>
+                                       <entry name="click_volume" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/keyboard/click_volume"/>
+                                       <entry name="delay" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/keyboard/delay"/>
+                                       <entry name="rate" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/keyboard/rate"/>
+                                       <entry name="click" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/keyboard/click"/>
+                                       <entry name="repeat" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/keyboard/repeat"/>
                                        <dir name="indicator">
                                                <entry name="enabledPlugins" mtime="1362842379" schema="/schemas/desktop/gnome/peripherals/keyboard/indicator/enabledPlugins"/>
                                                <entry name="backgroundColor" mtime="1362842379" schema="/schemas/desktop/gnome/peripherals/keyboard/indicator/backgroundColor"/>
@@ -21573,43 +21532,43 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                        </dir>
                                </dir>
                                <dir name="mouse">
-                                       <entry name="cursor_size" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/mouse/cursor_size"/>
-                                       <entry name="cursor_theme" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/mouse/cursor_theme"/>
-                                       <entry name="cursor_font" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/mouse/cursor_font"/>
-                                       <entry name="locate_pointer" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/mouse/locate_pointer"/>
-                                       <entry name="double_click" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/mouse/double_click"/>
-                                       <entry name="drag_threshold" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/mouse/drag_threshold"/>
-                                       <entry name="motion_threshold" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/mouse/motion_threshold"/>
-                                       <entry name="motion_acceleration" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/mouse/motion_acceleration"/>
-                                       <entry name="single_click" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/mouse/single_click"/>
-                                       <entry name="left_handed" mtime="1362855473" schema="/schemas/desktop/gnome/peripherals/mouse/left_handed"/>
+                                       <entry name="cursor_size" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/mouse/cursor_size"/>
+                                       <entry name="cursor_theme" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/mouse/cursor_theme"/>
+                                       <entry name="cursor_font" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/mouse/cursor_font"/>
+                                       <entry name="locate_pointer" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/mouse/locate_pointer"/>
+                                       <entry name="double_click" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/mouse/double_click"/>
+                                       <entry name="drag_threshold" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/mouse/drag_threshold"/>
+                                       <entry name="motion_threshold" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/mouse/motion_threshold"/>
+                                       <entry name="motion_acceleration" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/mouse/motion_acceleration"/>
+                                       <entry name="single_click" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/mouse/single_click"/>
+                                       <entry name="left_handed" mtime="1421877409" schema="/schemas/desktop/gnome/peripherals/mouse/left_handed"/>
                                </dir>
                        </dir>
                        <dir name="accessibility">
                                <dir name="keyboard">
-                                       <entry name="togglekeys_enable" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/togglekeys_enable"/>
-                                       <entry name="stickykeys_modifier_beep" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep"/>
-                                       <entry name="stickykeys_two_key_off" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/stickykeys_two_key_off"/>
-                                       <entry name="stickykeys_enable" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/stickykeys_enable"/>
-                                       <entry name="slowkeys_beep_reject" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/slowkeys_beep_reject"/>
-                                       <entry name="slowkeys_beep_accept" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/slowkeys_beep_accept"/>
-                                       <entry name="slowkeys_beep_press" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/slowkeys_beep_press"/>
-                                       <entry name="slowkeys_delay" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/slowkeys_delay"/>
-                                       <entry name="slowkeys_enable" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/slowkeys_enable"/>
-                                       <entry name="mousekeys_init_delay" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/mousekeys_init_delay"/>
-                                       <entry name="mousekeys_accel_time" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/mousekeys_accel_time"/>
-                                       <entry name="mousekeys_max_speed" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/mousekeys_max_speed"/>
-                                       <entry name="mousekeys_enable" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/mousekeys_enable"/>
-                                       <entry name="bouncekeys_beep_reject" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/bouncekeys_beep_reject"/>
-                                       <entry name="bouncekeys_delay" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/bouncekeys_delay"/>
-                                       <entry name="bouncekeys_enable" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/bouncekeys_enable"/>
-                                       <entry name="timeout" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/timeout"/>
-                                       <entry name="timeout_enable" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/timeout_enable"/>
-                                       <entry name="feature_state_change_beep" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/feature_state_change_beep"/>
-                                       <entry name="enable" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/keyboard/enable"/>
+                                       <entry name="togglekeys_enable" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/togglekeys_enable"/>
+                                       <entry name="stickykeys_modifier_beep" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep"/>
+                                       <entry name="stickykeys_two_key_off" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/stickykeys_two_key_off"/>
+                                       <entry name="stickykeys_enable" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/stickykeys_enable"/>
+                                       <entry name="slowkeys_beep_reject" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/slowkeys_beep_reject"/>
+                                       <entry name="slowkeys_beep_accept" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/slowkeys_beep_accept"/>
+                                       <entry name="slowkeys_beep_press" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/slowkeys_beep_press"/>
+                                       <entry name="slowkeys_delay" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/slowkeys_delay"/>
+                                       <entry name="slowkeys_enable" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/slowkeys_enable"/>
+                                       <entry name="mousekeys_init_delay" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/mousekeys_init_delay"/>
+                                       <entry name="mousekeys_accel_time" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/mousekeys_accel_time"/>
+                                       <entry name="mousekeys_max_speed" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/mousekeys_max_speed"/>
+                                       <entry name="mousekeys_enable" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/mousekeys_enable"/>
+                                       <entry name="bouncekeys_beep_reject" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/bouncekeys_beep_reject"/>
+                                       <entry name="bouncekeys_delay" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/bouncekeys_delay"/>
+                                       <entry name="bouncekeys_enable" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/bouncekeys_enable"/>
+                                       <entry name="timeout" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/timeout"/>
+                                       <entry name="timeout_enable" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/timeout_enable"/>
+                                       <entry name="feature_state_change_beep" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/feature_state_change_beep"/>
+                                       <entry name="enable" mtime="1421877410" schema="/schemas/desktop/gnome/accessibility/keyboard/enable"/>
                                </dir>
                                <dir name="startup">
-                                       <entry name="exec_ats" mtime="1362855473" schema="/schemas/desktop/gnome/accessibility/startup/exec_ats"/>
+                                       <entry name="exec_ats" mtime="1421877409" schema="/schemas/desktop/gnome/accessibility/startup/exec_ats"/>
                                </dir>
                        </dir>
                        <dir name="url-handlers">
@@ -21756,43 +21715,43 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                        </dir>
                        <dir name="applications">
                                <dir name="browser">
-                                       <entry name="nremote" mtime="1362855474" schema="/schemas/desktop/gnome/applications/browser/nremote"/>
-                                       <entry name="needs_term" mtime="1362855474" schema="/schemas/desktop/gnome/applications/browser/needs_term"/>
-                                       <entry name="exec" mtime="1362855474" schema="/schemas/desktop/gnome/applications/browser/exec"/>
+                                       <entry name="nremote" mtime="1421877410" schema="/schemas/desktop/gnome/applications/browser/nremote"/>
+                                       <entry name="needs_term" mtime="1421877410" schema="/schemas/desktop/gnome/applications/browser/needs_term"/>
+                                       <entry name="exec" mtime="1421877410" schema="/schemas/desktop/gnome/applications/browser/exec"/>
                                </dir>
                                <dir name="at">
                                        <entry name="screen_reader_enabled" mtime="1362854673" schema="/schemas/desktop/gnome/applications/at/screen_reader_enabled"/>
                                        <entry name="screen_magnifier_enabled" mtime="1362854673" schema="/schemas/desktop/gnome/applications/at/screen_magnifier_enabled"/>
                                        <entry name="screen_keyboard_enabled" mtime="1362854673" schema="/schemas/desktop/gnome/applications/at/screen_keyboard_enabled"/>
                                        <dir name="mobility">
-                                               <entry name="startup" mtime="1362855473" schema="/schemas/desktop/gnome/applications/at/mobility/startup"/>
-                                               <entry name="exec" mtime="1362855473" schema="/schemas/desktop/gnome/applications/at/mobility/exec"/>
+                                               <entry name="startup" mtime="1421877410" schema="/schemas/desktop/gnome/applications/at/mobility/startup"/>
+                                               <entry name="exec" mtime="1421877410" schema="/schemas/desktop/gnome/applications/at/mobility/exec"/>
                                        </dir>
                                        <dir name="visual">
-                                               <entry name="startup" mtime="1362855473" schema="/schemas/desktop/gnome/applications/at/visual/startup"/>
-                                               <entry name="exec" mtime="1362855473" schema="/schemas/desktop/gnome/applications/at/visual/exec"/>
+                                               <entry name="startup" mtime="1421877410" schema="/schemas/desktop/gnome/applications/at/visual/startup"/>
+                                               <entry name="exec" mtime="1421877410" schema="/schemas/desktop/gnome/applications/at/visual/exec"/>
                                        </dir>
                                </dir>
                                <dir name="tasks">
-                                       <entry name="needs_term" mtime="1362855473" schema="/schemas/desktop/gnome/applications/tasks/needs_term"/>
-                                       <entry name="exec" mtime="1362855473" schema="/schemas/desktop/gnome/applications/tasks/exec"/>
+                                       <entry name="needs_term" mtime="1421877410" schema="/schemas/desktop/gnome/applications/tasks/needs_term"/>
+                                       <entry name="exec" mtime="1421877410" schema="/schemas/desktop/gnome/applications/tasks/exec"/>
                                </dir>
                                <dir name="calendar">
-                                       <entry name="needs_term" mtime="1362855473" schema="/schemas/desktop/gnome/applications/calendar/needs_term"/>
-                                       <entry name="exec" mtime="1362855473" schema="/schemas/desktop/gnome/applications/calendar/exec"/>
+                                       <entry name="needs_term" mtime="1421877410" schema="/schemas/desktop/gnome/applications/calendar/needs_term"/>
+                                       <entry name="exec" mtime="1421877410" schema="/schemas/desktop/gnome/applications/calendar/exec"/>
                                </dir>
                                <dir name="window_manager">
-                                       <entry name="workspace_names" mtime="1362855472" schema="/schemas/desktop/gnome/applications/window_manager/workspace_names"/>
-                                       <entry name="number_of_workspaces" mtime="1362855472" schema="/schemas/desktop/gnome/applications/window_manager/number_of_workspaces"/>
-                                       <entry name="current" mtime="1362855472" schema="/schemas/desktop/gnome/applications/window_manager/current"/>
-                                       <entry name="default" mtime="1362855472" schema="/schemas/desktop/gnome/applications/window_manager/default"/>
+                                       <entry name="workspace_names" mtime="1421877409" schema="/schemas/desktop/gnome/applications/window_manager/workspace_names"/>
+                                       <entry name="number_of_workspaces" mtime="1421877409" schema="/schemas/desktop/gnome/applications/window_manager/number_of_workspaces"/>
+                                       <entry name="current" mtime="1421877409" schema="/schemas/desktop/gnome/applications/window_manager/current"/>
+                                       <entry name="default" mtime="1421877409" schema="/schemas/desktop/gnome/applications/window_manager/default"/>
                                </dir>
                                <dir name="component_viewer">
                                        <entry name="exec" mtime="1416959236" schema="/schemas/desktop/gnome/applications/component_viewer/exec"/>
                                </dir>
                                <dir name="terminal">
-                                       <entry name="exec_arg" mtime="1416959236" schema="/schemas/desktop/gnome/applications/terminal/exec_arg"/>
-                                       <entry name="exec" mtime="1416959236" schema="/schemas/desktop/gnome/applications/terminal/exec"/>
+                                       <entry name="exec_arg" mtime="1421877410" schema="/schemas/desktop/gnome/applications/terminal/exec_arg"/>
+                                       <entry name="exec" mtime="1421877410" schema="/schemas/desktop/gnome/applications/terminal/exec"/>
                                </dir>
                        </dir>
                </dir>
index d77c720786d6acdbc9e78d41fbe97106e60141d9..b0798176afcb8ae865aa511ab949aec3e9699cc1 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # 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
index 2ef35e714454a1b4049e9464c6ad0d082b33f55d..47bf2a4f3dd7bae9505c444ba274cf5b57a214f4 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
index 4a6a7e8954c7d85c173add9276f13d6fe579d0a6..6edcbe2b587ae356ca4cbe8b2b815269c6b39093 100755 (executable)
@@ -1,21 +1,86 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # 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
 }
index a4083d003a9c2911ca8e1d4b2fa1a89a405254b6..98c2c43e1b1efe544d71208f6bd65ef703f8690e 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
index c2e883dbd44651e64edd8835b9a45af13742029f..0130376d189beaef0e0ae276586f4e128e64b973 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
index fb6260f4cc790306d409e6526f2e501be4440954..7d2a2d955338799b55d17906073a45bdd76a08e3 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
index 651590df74acd52eae5ac718606fd7c771def277..bc6aff9e84e19586adba4949d0c879407412008a 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # 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
 
index 507424b794a72b3da2c3be164234ec39f55c5ca2..0cadd7de72c3037b7ea26088aaeb66b29ab74dbc 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
index 5552b977b93cfd3876c35b5facb6c13d11f33565..f07de69ce8e36e9ed59f3ba5bf23f8665e2cdf6e 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
index 6e4ddbf5cdc6cc58b45769830bab72f0d856e0e0..c65e01e7c524dbd1e8db1dd1cb1cf43de479bad0 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # 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
 }
index 79747653b940b3bd97d0416c8ffd7ba48919acdd..89f4008b9f160a03a68cee9a71563aa349d4e80d 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # 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
index 4c7e6e1f5023e8f0d77a5a3aca5468e2403ead2d..a80a54c22e659bdaa1a1f9ed95f4283ec6159361 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2013 William Hubbs <w.d.hubbs@gmail.com>
 # 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
index 17f60ce87ae9dd5aa5a53f2b4884623eef61a118..15f98b063dd4de86d2571bef20bb3026e460c340 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
index 69e648317cc4ef8f5ee7bb8040565bf69b0518fc..8a0a23d300d414500d7d749b6892c164b47650dd 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # 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
index be1a3ba3f4a3bdba0b84c23f21f8b06791661cb9..b085e86724bc2970b21072a44148e7bf356b9a46 100755 (executable)
@@ -1,11 +1,8 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # 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 (executable)
index 0000000..a13a5ce
--- /dev/null
@@ -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 (executable)
index 6bb1009..0000000
+++ /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 $?
-}
index e354dfd19d9aadd6e8a4afab843d359cc9c07a9e..4f7e830bb6a228e7ec437c0f419b1a77e518857c 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
index 6efa34fb9f5b58672e8a153b3afbf06b0e89bfd6..98145e6a3e4802084ac5b9b339d534b7c40d80b3 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # 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
index 04687c6e7d74c79db400e7254b93eafeeee1e342..d43102257a4261dce8228736a80fc984dd5d2844 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
index 5e59b25f8dd94904603b9fc162989280d966462b..3eed4322629a51c160a349e978f2813c0b7ad36e 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # 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
index 309d37b72cda8ade9c8dc14633b9403e9e477bf2..5d68dd95f12aa4cd21d78977094b0ce382fb4ebc 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
index 8a851fadc6d2c6578c05c2e05b6225775dff1b79..754ae1d59e242219025a8c322e1846c43d9f34b4 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
index ba9cd3d60ccad67f77996e0313e1a99aa0b314b7..b43819b675cbb2da34d5a9ce56ed483f6368fe43 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2009 Roy Marples <roy@marples.name>
 # 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 $?
 }
index b94dcc4ffca010cdcb82e23c2473362cc6650889..5a4159c4850797e73b6a0baff4cf555880e07f8b 100755 (executable)
@@ -1,34 +1,16 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # 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"
 }
index ec88c6d0e187bdeeeb79de73035bf47b05773275..0f84bfb4cf39bb24e092d481e04112ed628ee177 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # 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
 }
index b949b76b8d76cc4df24a6c0ce939606f2c838d3a..ddd5bb0ed14b8ee8fe5b08e9e235922ac274f5c9 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2008-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
index 058980e44e3d61a28a8c34a1ff4a3ecf49a92dad..06d3a179fc4dc7d0cd4ee343ac8ba6786d407a41 100755 (executable)
@@ -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
 }
index 77727414cdefb2acfc369769345fa01123100d59..18af68e647e285d2defd6c4e570a9d852ccc19ec 100755 (executable)
@@ -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
index 0e9abfebd93dbf63505f1f055b47c724bf1f9fd9..72b2be226a5fc7b863b05ac4557c5ca986ce0f69 100755 (executable)
@@ -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 (executable)
index a868340..0000000
+++ /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
-}
index 4bfecab4bbbbabbf8be46933a5bb77ca2f45a482..780db124e9cd6aa6e0357972e8243bfc7a00a26a 100755 (executable)
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
index 9826e6bb149e7d7f990f3b48b6981ec7a7d9be43..2f7b47cb2d0a6a94d65b3ed6c33d73b72a0ca498 100755 (executable)
@@ -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/savedconfig/sys-apps/busybox-1.23.0 b/portage/savedconfig/sys-apps/busybox-1.23.0
new file mode 100644 (file)
index 0000000..8aafc7a
--- /dev/null
@@ -0,0 +1,1055 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.23.0
+# Wed Jan 21 21:34:58 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 (file)
index 0000000..14b9971
--- /dev/null
@@ -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 (file)
index 0000000..15b310e
--- /dev/null
@@ -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 (file)
index 0000000..f7dfb76
--- /dev/null
@@ -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 (symlink)
index 0000000..a7bfcce
--- /dev/null
@@ -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 (file)
index 0000000..b442db4
--- /dev/null
@@ -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 (file)
index 0000000..3bd7159
--- /dev/null
@@ -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 fba55d331bf5f5af3e42afa08259266d18e07ea6..a4e155f93730a08de7f8e5ece878527c96fd1bba 100644 (file)
--- a/rc.conf
+++ b/rc.conf
@@ -52,6 +52,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"
@@ -74,6 +78,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
@@ -87,7 +95,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
index cd14e71d4a9e8080dfe808e4ae3b8f2371c06f65..5882c9c234b0136fcd36ff675a3d1be4e00b7105 100644 (file)
@@ -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
@@ -84,8 +84,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
 
index 88dcdd82ff2947f7851d0fa2c3906f176316cdea..15deabd9b1b29904e6c8eb20886ce76e94e01fac 100644 (file)
@@ -8,6 +8,7 @@
   <rewriteURI uriStartString="http://www.w3.org/TR/xhtml1/DTD" rewritePrefix="/usr/share/sgml/xhtml1"/>
   <public publicId="-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" uri="/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"/>
   <system systemId="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" uri="/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"/>
+  <system systemId="http://glade.gnome.org/glade-2.0.dtd" uri="/usr/share/xml/libglade/glade-2.0.dtd"/>
   <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook" catalog="file:///etc/xml/docbook"/>
   <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook" catalog="file:///etc/xml/docbook"/>
   <delegatePublic publicIdStartString="-//OASIS//DTD DocBook" catalog="file:///etc/xml/docbook"/>
@@ -16,5 +17,4 @@
   <delegatePublic publicIdStartString="ISO 8879:1986" catalog="file:///etc/xml/docbook"/>
   <delegateSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///etc/xml/docbook"/>
   <delegateURI uriStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///etc/xml/docbook"/>
-  <system systemId="http://glade.gnome.org/glade-2.0.dtd" uri="/usr/share/xml/libglade/glade-2.0.dtd"/>
 </catalog>
index 851d0b25cd7048bc777b1bd0751c3b4f31be85a2..ac2f64ee1cb0a7b26ea6fecdf3002df9262e0da6 100644 (file)
   <public publicId="-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" uri="file:///usr/share/sgml/docbook/xml-dtd-4.5/calstblx.dtd"/>
   <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.5" rewritePrefix="file:///usr/share/sgml/docbook/xml-dtd-4.5"/>
   <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.5" rewritePrefix="file:///usr/share/sgml/docbook/xml-dtd-4.5"/>
+  <public publicId="-//OASIS//DTD Simplified DocBook XML V1.0//EN" uri="file:///usr/share/sgml/docbook/xml-simple-dtd-1.0/sdocbook.dtd"/>
+  <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/simple/1.0" rewritePrefix="file:///usr/share/sgml/docbook/xml-simple-dtd-1.0"/>
+  <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/simple/1.0" rewritePrefix="file:///usr/share/sgml/docbook/xml-simple-dtd-1.0"/>
+  <public publicId="-//OASIS//DTD Simplified DocBook XML V4.1.2.4//EN" uri="file:///usr/share/sgml/docbook/xml-simple-dtd-4.1.2.4/sdocbook.dtd"/>
+  <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/simple/4.1.2.4" rewritePrefix="file:///usr/share/sgml/docbook/xml-simple-dtd-4.1.2.4"/>
+  <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/simple/4.1.2.4" rewritePrefix="file:///usr/share/sgml/docbook/xml-simple-dtd-4.1.2.4"/>
 </catalog>