Merge branch 'current' of github.com:vyos/vyos-build into current

.gitmodules

@@ -130,3 +130,9 @@
 [submodule "packages/udp-broadcast-relay"]
 	path = packages/udp-broadcast-relay
 	url = https://github.com/vyos/udp-broadcast-relay.git
+[submodule "packages/vyos-keepalived"]
+	path = packages/vyos-keepalived
+	url = https://github.com/vyos/vyos-keepalived.git
+[submodule "packages/vyatta-iproute"]
+	path = packages/vyatta-iproute
+	url = https://github.com/vyos/vyatta-iproute.git

data/live-build-config/hooks/21-systemd_conf.chroot

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-echo I: Show systemd statuson boot.
-
-echo "ShowStatus=yes" >> /etc/systemd/system.conf

data/live-build-config/includes.chroot/etc/systemd/journald.conf

@@ -1,3 +1,5 @@
+#  This file is managed in vyos-build
+#
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it

data/live-build-config/includes.chroot/etc/systemd/system.conf

@@ -0,0 +1,55 @@
+#  This file is managed in vyos-build
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+# See systemd-system.conf(5) for details
+
+[Manager]
+#LogLevel=info
+#LogTarget=journal-or-kmsg
+#LogColor=yes
+#LogLocation=no
+#DumpCore=yes
+#CrashShell=no
+ShowStatus=yes
+#CrashChVT=1
+#CPUAffinity=1 2
+#JoinControllers=cpu,cpuacct net_cls,net_prio
+#RuntimeWatchdogSec=0
+#ShutdownWatchdogSec=10min
+#CapabilityBoundingSet=
+#SystemCallArchitectures=
+#TimerSlackNSec=
+#DefaultTimerAccuracySec=1min
+#DefaultStandardOutput=journal
+#DefaultStandardError=inherit
+#DefaultTimeoutStartSec=90s
+#DefaultTimeoutStopSec=90s
+#DefaultRestartSec=100ms
+#DefaultStartLimitInterval=10s
+#DefaultStartLimitBurst=5
+#DefaultEnvironment=
+#DefaultCPUAccounting=no
+#DefaultBlockIOAccounting=no
+#DefaultMemoryAccounting=no
+#DefaultLimitCPU=
+#DefaultLimitFSIZE=
+#DefaultLimitDATA=
+#DefaultLimitSTACK=
+#DefaultLimitCORE=
+#DefaultLimitRSS=
+#DefaultLimitNOFILE=
+#DefaultLimitAS=
+#DefaultLimitNPROC=
+#DefaultLimitMEMLOCK=
+#DefaultLimitLOCKS=
+#DefaultLimitSIGPENDING=
+#DefaultLimitMSGQUEUE=
+#DefaultLimitNICE=
+#DefaultLimitRTPRIO=
+#DefaultLimitRTTIME=

packages/vyatta-iproute

@@ -0,0 +1 @@
+Subproject commit 0b78fea66ab7d8ae84da7345650965e1752e1c28

packages/vyos-keepalived

@@ -0,0 +1 @@
+Subproject commit dc8ade02407f836873e78887f4b3c94b6540a578

packages/vyos-kernel

@@ -1 +1 @@
-Subproject commit 94c9ef1d0d549d46187f2abb3c1d6979654dc289
+Subproject commit 123087671203ad50989a2ff0c91d0df2dc4d32e1

scripts/live-build-config

@@ -36,7 +36,7 @@ lb config noauto \
         --architectures {{architecture}} \
         --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay" \
         --linux-flavours {{architecture}}-vyos \
-        --linux-packages linux-image-4.4.113 \
+        --linux-packages linux-image-4.14.26 \
         --bootloader syslinux \
         --binary-images iso-hybrid \
         --debian-installer false \