From: Frank Brehm Date: Tue, 3 Mar 2015 20:14:02 +0000 (+0100) Subject: Current state X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=d9302cf685f8aee5cc617c1bb7b6b1348682a375;p=config%2Fsamara%2Fetc.git Current state --- diff --git a/X11/xinit/xinitrc b/X11/xinit/xinitrc index 53723a0..e6dd7fe 100644 --- a/X11/xinit/xinitrc +++ b/X11/xinit/xinitrc @@ -18,6 +18,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/X11/xinit/xserverrc b/X11/xinit/xserverrc index b4de252..6b57eeb 100755 --- a/X11/xinit/xserverrc +++ b/X11/xinit/xserverrc @@ -1,2 +1,6 @@ #!/bin/sh -exec /usr/bin/X -nolisten tcp "$@" +if [ -z "$XDG_VTNR" ]; then + exec /usr/bin/X -nolisten tcp "$@" +else + exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR +fi diff --git a/conf.d/nfs b/conf.d/nfs index 60ed5d8..2841688 100644 --- a/conf.d/nfs +++ b/conf.d/nfs @@ -7,7 +7,7 @@ # For NFSv4 users, you'll want to add "rpc.idmapd" here. NFS_NEEDED_SERVICES="rpc.idmapd" -# Number of servers to be started up by default +# Options to pass to rpc.nfsd OPTS_RPC_NFSD="8" # Options to pass to rpc.mountd diff --git a/conf.d/nfsclient b/conf.d/nfsclient index d885b63..8a99557 100644 --- a/conf.d/nfsclient +++ b/conf.d/nfsclient @@ -1,3 +1,14 @@ +# You need to decide which nfs protocol version you want to use. +# If you are unsure, leave these alone. +# +# If you are using only nfsv4, uncomment this line: +# +#rc_need="!rpc.statd" +# +# If you are using only nfsv3, uncomment this line: +# +#rc_need="!rpc.idmapd" +# # 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 diff --git a/conf.d/unbound b/conf.d/unbound new file mode 100644 index 0000000..b4de7cf --- /dev/null +++ b/conf.d/unbound @@ -0,0 +1,4 @@ +# Settings should normally not need any changes. + +# Location of the unbound configuration file. Leave empty for the default. +#UNBOUND_CONFFILE="/etc/unbound/unbound.conf" diff --git a/dbus-1/system.conf b/dbus-1/system.conf index cb5d15f..0d22e67 100644 --- a/dbus-1/system.conf +++ b/dbus-1/system.conf @@ -68,6 +68,14 @@ + + + + + + @@ -45,6 +49,7 @@ TODO: document the other workarounds.