From 890c00d6b809d0d908903fbf1a0ec5ceca8b54ad Mon Sep 17 00:00:00 2001 From: selias Date: Fri, 22 Sep 2017 10:49:28 +0200 Subject: Update disk-image-builder scripts to allow IPv6 Change-Id: I28ed08689db97eabc21726afa9d977fcda526dfb Signed-off-by: selias --- .../ubuntu/scripts-remote/disable_ipv6.sh | 21 +++++++++++++++++++++ .../scripts-remote/serial-console-ubuntu-16.04.1.sh | 6 +++--- 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 resources/tools/disk-image-builder/ubuntu/scripts-remote/disable_ipv6.sh (limited to 'resources/tools/disk-image-builder/ubuntu/scripts-remote') diff --git a/resources/tools/disk-image-builder/ubuntu/scripts-remote/disable_ipv6.sh b/resources/tools/disk-image-builder/ubuntu/scripts-remote/disable_ipv6.sh new file mode 100644 index 0000000000..43e59787a7 --- /dev/null +++ b/resources/tools/disk-image-builder/ubuntu/scripts-remote/disable_ipv6.sh @@ -0,0 +1,21 @@ +#!/bin/sh -e + +# Copyright (c) 2017 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +echo "********** Disabling IPv6 ***********" +# Disable on all existing interfaces +echo net.ipv6.conf.all.IPv6_disable=1 > /etc/sysctl.d/10-IPv6_disable.conf +# Disable by default for any new interfaces +echo net.ipv6.conf.default.IPv6_disable=1 >> /etc/sysctl.d/10-IPv6_disable.conf \ No newline at end of file diff --git a/resources/tools/disk-image-builder/ubuntu/scripts-remote/serial-console-ubuntu-16.04.1.sh b/resources/tools/disk-image-builder/ubuntu/scripts-remote/serial-console-ubuntu-16.04.1.sh index c065021199..13ef63c2a9 100644 --- a/resources/tools/disk-image-builder/ubuntu/scripts-remote/serial-console-ubuntu-16.04.1.sh +++ b/resources/tools/disk-image-builder/ubuntu/scripts-remote/serial-console-ubuntu-16.04.1.sh @@ -1,6 +1,6 @@ #!/bin/sh -e -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2017 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -16,7 +16,7 @@ ## ## Serial console ## -echo "********** CONFIGURING SERIAL CONSOLE AND DISABLING IPV6 **********" +echo "********** CONFIGURING SERIAL CONSOLE **********" cat - > /etc/default/grub <<"_EOF" # If you change this file, run 'update-grub' afterwards to update # /boot/grub/grub.cfg. @@ -26,7 +26,7 @@ cat - > /etc/default/grub <<"_EOF" GRUB_DEFAULT=0 GRUB_TIMEOUT=1 GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian` -GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8 ipv6.disable=1" +GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8" GRUB_TERMINAL=serial GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1" -- cgit 1.2.3-korg