diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-02-28 13:33:01 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-02-28 13:33:01 +0100 |
| commit | 65e2de337585ccec068ae7a97a824b7f6c558e26 (patch) | |
| tree | 6b6cc31c3faa37748009e948a80b8d217bac3fbf | |
| parent | d8dd509656e24d0050050ed067021e4b45e07d59 (diff) | |
| parent | 42b06c04970392d7f2df8fdbcfa9345cfab95f33 (diff) | |
| download | vyatta-cfg-system-65e2de337585ccec068ae7a97a824b7f6c558e26.tar.gz vyatta-cfg-system-65e2de337585ccec068ae7a97a824b7f6c558e26.zip | |
Merge branch 'current' of github.com:vyos/vyatta-cfg-system into current
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | scripts/install/install-get-partition | 7 | ||||
| -rw-r--r-- | templates/service/dns/forwarding/domain/node.tag/server/node.def | 6 |
3 files changed, 18 insertions, 3 deletions
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 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..." 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 |