From da9bb735ce1f6985057e13494d9f8db832dd3855 Mon Sep 17 00:00:00 2001
From: Kim <kim.sidney@gmail.com>
Date: Wed, 21 Feb 2018 10:23:14 +0100
Subject: Manage config files with included files instead of echo, sed etc.
 (#16)

Manage system.conf from file instead of hook.
Add comment to the files where they are managed
---
 .../hooks/21-pam_mkhomedir.chroot                  | 16 +++++++
 .../live-build-config/hooks/21-systemd_conf.chroot |  5 --
 .../hooks/22-pam_mkhomedir.chroot                  | 16 -------
 .../includes.chroot/etc/systemd/journald.conf      |  2 +
 .../includes.chroot/etc/systemd/system.conf        | 55 ++++++++++++++++++++++
 5 files changed, 73 insertions(+), 21 deletions(-)
 create mode 100755 data/live-build-config/hooks/21-pam_mkhomedir.chroot
 delete mode 100755 data/live-build-config/hooks/21-systemd_conf.chroot
 delete mode 100755 data/live-build-config/hooks/22-pam_mkhomedir.chroot
 create mode 100644 data/live-build-config/includes.chroot/etc/systemd/system.conf

diff --git a/data/live-build-config/hooks/21-pam_mkhomedir.chroot b/data/live-build-config/hooks/21-pam_mkhomedir.chroot
new file mode 100755
index 00000000..af155ba4
--- /dev/null
+++ b/data/live-build-config/hooks/21-pam_mkhomedir.chroot
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+echo I: Create home directory on login.
+
+cat > /usr/share/pam-configs/mkhomedir <<EOF
+Name: Create home directory during login
+Default: yes
+Priority: 900
+Session-Type: Additional
+Session:
+        required        pam_mkhomedir.so umask=0022 skel=/etc/skel
+EOF
+sync
+sed -i '/mkhomedir/d' /var/lib/pam/seen
+pam-auth-update --package
+
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/hooks/22-pam_mkhomedir.chroot b/data/live-build-config/hooks/22-pam_mkhomedir.chroot
deleted file mode 100755
index af155ba4..00000000
--- a/data/live-build-config/hooks/22-pam_mkhomedir.chroot
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-echo I: Create home directory on login.
-
-cat > /usr/share/pam-configs/mkhomedir <<EOF
-Name: Create home directory during login
-Default: yes
-Priority: 900
-Session-Type: Additional
-Session:
-        required        pam_mkhomedir.so umask=0022 skel=/etc/skel
-EOF
-sync
-sed -i '/mkhomedir/d' /var/lib/pam/seen
-pam-auth-update --package
-
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=
-- 
cgit v1.2.3


From 31047fb47f89dd3b8788a8da7df9064e81924679 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 14 Mar 2018 15:57:41 +0100
Subject: Added 'vyos-keepalived' submodule

---
 .gitmodules              | 3 +++
 packages/vyos-keepalived | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 packages/vyos-keepalived

diff --git a/.gitmodules b/.gitmodules
index 5e095b4d..930e7ab3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -130,3 +130,6 @@
 [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
diff --git a/packages/vyos-keepalived b/packages/vyos-keepalived
new file mode 160000
index 00000000..dc8ade02
--- /dev/null
+++ b/packages/vyos-keepalived
@@ -0,0 +1 @@
+Subproject commit dc8ade02407f836873e78887f4b3c94b6540a578
-- 
cgit v1.2.3


From 3ba5eec40abb30207300f5928ae7c734075d2cdb Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 15 Mar 2018 07:28:44 +0100
Subject: T565: VyOS Kernel Update v4.14.26

---
 packages/vyos-kernel      | 2 +-
 scripts/live-build-config | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/vyos-kernel b/packages/vyos-kernel
index 94c9ef1d..847dcd0e 160000
--- a/packages/vyos-kernel
+++ b/packages/vyos-kernel
@@ -1 +1 @@
-Subproject commit 94c9ef1d0d549d46187f2abb3c1d6979654dc289
+Subproject commit 847dcd0eb180f509e3d39c5d2cd978bc3bd13733
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 \
-- 
cgit v1.2.3


From e9b6d0942d73c8863bba2c402c2337d27e4e1dc4 Mon Sep 17 00:00:00 2001
From: Yuya Kusakabe <yuya.kusakabe@gmail.com>
Date: Tue, 20 Mar 2018 10:17:04 +0900
Subject: T578: Update vyos-kernel

---
 packages/vyos-kernel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vyos-kernel b/packages/vyos-kernel
index 847dcd0e..12308767 160000
--- a/packages/vyos-kernel
+++ b/packages/vyos-kernel
@@ -1 +1 @@
-Subproject commit 847dcd0eb180f509e3d39c5d2cd978bc3bd13733
+Subproject commit 123087671203ad50989a2ff0c91d0df2dc4d32e1
-- 
cgit v1.2.3


From 65b82136a19549fcaf7ae1a81daa46695a6c08e1 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 21 Mar 2018 20:18:08 +0100
Subject: Added vyatta-iproute submodule

---
 .gitmodules             | 3 +++
 packages/vyatta-iproute | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 packages/vyatta-iproute

diff --git a/.gitmodules b/.gitmodules
index 930e7ab3..7ec3cb00 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -133,3 +133,6 @@
 [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/packages/vyatta-iproute b/packages/vyatta-iproute
new file mode 160000
index 00000000..0b78fea6
--- /dev/null
+++ b/packages/vyatta-iproute
@@ -0,0 +1 @@
+Subproject commit 0b78fea66ab7d8ae84da7345650965e1752e1c28
-- 
cgit v1.2.3