Merge tag 'initscripts-9.50-1' into distro/mgauser/colin/update-to-9-50

Tag as initscripts-9.50-1

Conflicts:
	Makefile
	lang.csh
	lang.sh
	po/Makefile
	rc.d/init.d/network
	service
	sysconfig.txt
	sysconfig/init
	sysconfig/network-scripts/ifup
	sysconfig/network-scripts/ifup-eth
	sysconfig/network-scripts/ifup-ippp
	sysconfig/network-scripts/network-functions
	sysctl.conf
	systemd/fedora-storage-init

1 files changed, 8 insertions, 3 deletions

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 18dad676..a5feff88 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 TEXTDOMAIN=initscripts
@@ -30,7 +30,7 @@ cd /etc/sysconfig/network-scripts
 CONFIG=${1}
 
 [ -z "${CONFIG}" ] && {
-    echo $"Usage: ifup <device name>" >&2
+    echo $"Usage: ifup <configuration>" >&2
     exit 1
 }
 
@@ -38,7 +38,7 @@ need_config "${CONFIG}"
 
 [ -f "${CONFIG}" ] || {
     echo $"$0: configuration for ${1} not found." >&2
-    echo $"Usage: ifup <device name>" >&2
+    echo $"Usage: ifup <configuration>" >&2
     exit 1
 }
 
@@ -70,6 +70,9 @@ fi
 
 if [ "$_use_nm" = "true" ]; then
     if [ -n "$UUID" ]; then
+        if [ "foo$2" = "fooboot" ] && [ "${TYPE}" = "Wireless" ]; then
+            exit 0
+        fi
         nmcli con up uuid "$UUID"
         exit $?
     fi
@@ -133,6 +136,8 @@ if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ]; then
 	    }
 	fi
     fi
+
+    /usr/lib/systemd/systemd-sysctl --prefix "/proc/sys/net/ipv4/conf/${DEVICE}" --prefix "/proc/sys/net/ipv6/conf/${DEVICE}"
 fi
 
 # signalling the start of connection