From d0af07c4b5f56b8faf2340c97676c2ff1b6a0933 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 21 Feb 2018 11:28:30 +0100
Subject: T546: Add support for IPv6 address in 'service dns forwarding domain'

---
 templates/service/dns/forwarding/domain/node.tag/server/node.def | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/templates/service/dns/forwarding/domain/node.tag/server/node.def b/templates/service/dns/forwarding/domain/node.tag/server/node.def
index 8f40a299..e616c0aa 100644
--- a/templates/service/dns/forwarding/domain/node.tag/server/node.def
+++ b/templates/service/dns/forwarding/domain/node.tag/server/node.def
@@ -1,3 +1,5 @@
 multi:
-type: ipv4
-help: DNS server to forward queries 
+type: ipv4,ipv6
+help: Domain Name Server (DNS) to forward queries
+val_help: ipv4; Domain Name Server (DNS) address
+val_help: ipv6; Domain Name Server (DNS) address
-- 
cgit v1.2.3


From 622228a6e8c600c895192daa7f3227602ba1237c Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 21 Feb 2018 11:29:48 +0100
Subject: 0.20.44+vyos2+current9

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 89c7b4ca..4eaba380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vyatta-cfg-system (0.20.44+vyos2+current9) unstable; urgency=medium
+
+  * T546: Add support for IPv6 address in 'service dns forwarding domain'
+  * T533: Rename "client" NTP option to "allow-clients"
+  * T522: Adjust rsyslog.conf to use the journald forwarding
+
+ -- Christian Poessinger <christian@poessinger.com>  Wed, 21 Feb 2018 11:28:46 +0100
+
 vyatta-cfg-system (0.20.44+vyos2+current8) unstable; urgency=medium
 
   * T523: Only bind dnsmasq to configured interfaces
-- 
cgit v1.2.3


From 42b06c04970392d7f2df8fdbcfa9345cfab95f33 Mon Sep 17 00:00:00 2001
From: Kim <kim.sidney@gmail.com>
Date: Thu, 22 Feb 2018 11:40:47 +0100
Subject: sometimes drives report they are not aligned

And then on reboot it hangs where it should start grub
---
 scripts/install/install-get-partition | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition
index f1b373ae..a8590031 100755
--- a/scripts/install/install-get-partition
+++ b/scripts/install/install-get-partition
@@ -688,7 +688,12 @@ create_partitions() {
   lecho "Creating root partition on /dev/$ldrive"
 
   # Make the root partition
-  output=$(parted --script --align optimal /dev/$ldrive mkpart primary 0% $root_part_size)
+  # if optimal_io_size is empty use default of 2048s
+  if [ $(cat /sys/block/$ldrive/queue/optimal_io_size) -gt 0 ]; then
+    output=$(parted --script --align optimal /dev/$ldrive mkpart primary 0% $root_part_size)
+  else
+    output=$(parted --script --align optimal /dev/$ldrive mkpart primary 2048s $root_part_size)
+  fi
   status=$?
   if [ "$status" != 0 ]; then
     echo -e "Error creating primary partition on $ldrive.\nPlease see $INSTALL_LOG for more details.\nExiting..."
-- 
cgit v1.2.3