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

9 files changed, 64 insertions, 6 deletions

diff --git a/.gitmodules b/.gitmodules
index 5e095b4d..7ec3cb00 100644
--- a/.gitmodules
+++ b/.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
diff --git a/data/live-build-config/hooks/22-pam_mkhomedir.chroot b/data/live-build-config/hooks/21-pam_mkhomedir.chroot
index af155ba4..af155ba4 100755
--- a/data/live-build-config/hooks/22-pam_mkhomedir.chroot
+++ b/data/live-build-config/hooks/21-pam_mkhomedir.chroot
diff --git a/data/live-build-config/hooks/21-systemd_conf.chroot b/data/live-build-config/hooks/21-systemd_conf.chroot
deleted file mode 100755
index 541fdf11..00000000
--- a/data/live-build-config/hooks/21-systemd_conf.chroot
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-echo I: Show systemd statuson boot.
-
-echo "ShowStatus=yes" >> /etc/systemd/system.conf
diff --git a/data/live-build-config/includes.chroot/etc/systemd/journald.conf b/data/live-build-config/includes.chroot/etc/systemd/journald.conf
index 07612424..5aecf4f8 100644
--- a/data/live-build-config/includes.chroot/etc/systemd/journald.conf
+++ b/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
diff --git a/data/live-build-config/includes.chroot/etc/systemd/system.conf b/data/live-build-config/includes.chroot/etc/systemd/system.conf
new file mode 100644
index 00000000..91af4090
--- /dev/null
+++ b/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=
diff --git a/packages/vyatta-iproute b/packages/vyatta-iproute
new file mode 160000
+Subproject 0b78fea66ab7d8ae84da7345650965e1752e1c2
diff --git a/packages/vyos-keepalived b/packages/vyos-keepalived
new file mode 160000
+Subproject dc8ade02407f836873e78887f4b3c94b6540a57
diff --git a/packages/vyos-kernel b/packages/vyos-kernel
-Subproject 94c9ef1d0d549d46187f2abb3c1d6979654dc28
+Subproject 123087671203ad50989a2ff0c91d0df2dc4d32e
diff --git a/scripts/live-build-config b/scripts/live-build-config
index 4c4a38ac..15df7aa8 100755
--- a/scripts/live-build-config
+++ b/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 \