saving uncommitted changes in /etc prior to emerge run

diff --git a/init.d/salt-api b/init.d/salt-api
index e69acdf86b9be5a38e54c7bb1c8091c877616b0a..235ec5a2ef1627effb344c99fb332576f912f5fd 100755 (executable)
--- a/init.d/salt-api
+++ b/init.d/salt-api
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/init.d/salt-master b/init.d/salt-master
index dc4962809e02ddb1945adc679a6e494d7725c813..00628b948893cdbefd2a9c606399fda33cafdea6 100755 (executable)
--- a/init.d/salt-master
+++ b/init.d/salt-master
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/init.d/salt-minion b/init.d/salt-minion
index 350703a0b52ba8768c722f93e377b282aa10f7db..34358eebf262fe3970698eabdc959dd57f0a8a8f 100755 (executable)
--- a/init.d/salt-minion
+++ b/init.d/salt-minion
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/init.d/salt-syndic b/init.d/salt-syndic
index 65916b4b42c2fe4595fe7d51978e29de50105891..338da07cf6ad627b31c1c4772d03a9adf129d96f 100755 (executable)
--- a/init.d/salt-syndic
+++ b/init.d/salt-syndic
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/salt/cloud b/salt/cloud
index 5bd28df3214340f154e16706471118022e069b18..80fe5e345389821daba786708e7eb77089ff77d0 100644 (file)
--- a/salt/cloud
+++ b/salt/cloud
@@ -1,4 +1,4 @@
-# This file should normally be installed at: /etc/salt/cloud 
+# This file should normally be installed at: /etc/salt/cloud
 
 
 ##########################################
@@ -44,7 +44,7 @@
 #log_level_logfile: info
 
 
-# The date and time format used in log messages. Allowed date/time formating
+# The date and time format used in log messages. Allowed date/time formatting
 # can be seen here:
 #
 #      http://docs.python.org/library/time.html#time.strftime

diff --git a/salt/proxy b/salt/proxy
index 472df35af504da363c2e67d9a2973583195d9234..7b835e25ea52ef405500e7c81584f18b06ac0858 100644 (file)
--- a/salt/proxy
+++ b/salt/proxy
@@ -13,7 +13,7 @@
 #default_include: minion.d/*.conf
 
 # Backwards compatibility option for proxymodules created before 2015.8.2
-# This setting will default to 'False' in the Boron release
+# This setting will default to 'False' in the 2016.3.0 release
 # Setting this to True adds proxymodules to the __opts__ dictionary.
 # This breaks several Salt features (basically anything that serializes
 # __opts__ over the wire) but retains backwards compatibility.
@@ -23,6 +23,14 @@
 # resolved, then the minion will fail to start.
 #master: salt
 
+# If a proxymodule has a function called 'grains', then call it during
+# regular grains loading and merge the results with the proxy's grains
+# dictionary.  Otherwise it is assumed that the module calls the grains
+# function in a custom way and returns the data elsewhere
+#
+# Default to False for 2016.3 and Carbon.  Switch to True for Nitrogen.
+# proxy_merge_grains_in_module: False
+
 # If multiple masters are specified in the 'master' setting, the default behavior
 # is to always try to connect to them in the order they are listed. If random_master is
 # set to True, the order will be randomized instead. This can be helpful in distributing
@@ -419,12 +427,15 @@
 #fileserver_limit_traversal: False
 
 # The hash_type is the hash to use when discovering the hash of a file in
-# the local fileserver. The default is md5, but sha1, sha224, sha256, sha384
-# and sha512 are also supported.
+# the local fileserver. The default is sha256 but sha224, sha384 and sha512
+# are also supported.
+#
+# WARNING: While md5 and sha1 are also supported, do not use it due to the high chance
+# of possible collisions and thus security breach.
 #
 # Warning: Prior to changing this value, the minion should be stopped and all
 # Salt caches should be cleared.
-#hash_type: md5
+#hash_type: sha256
 
 # The Salt pillar is searched for locally if file_client is set to local. If
 # this is the case, and pillar data is defined, then the pillar_roots need to
@@ -510,7 +521,7 @@
 # Default: 'warning'
 #log_level_logfile:
 
-# The date and time format used in log messages. Allowed date/time formating
+# The date and time format used in log messages. Allowed date/time formatting
 # can be seen here: http://docs.python.org/library/time.html#time.strftime
 #log_datefmt: '%H:%M:%S'
 #log_datefmt_logfile: '%Y-%m-%d %H:%M:%S'