diff options
Diffstat (limited to 'resources/tools/disk-image-builder/centos')
4 files changed, 32 insertions, 3 deletions
diff --git a/resources/tools/disk-image-builder/centos/CHANGELOG b/resources/tools/disk-image-builder/centos/CHANGELOG index c22e4bf6f3..2013bfda77 100644 --- a/resources/tools/disk-image-builder/centos/CHANGELOG +++ b/resources/tools/disk-image-builder/centos/CHANGELOG @@ -1,3 +1,7 @@ +## [1.6] - 2017-09-22 + +Moved IPv6_disable from GRUB boot params to sysctl + ## [1.5] - 2017-08-01 Added tcpdump. diff --git a/resources/tools/disk-image-builder/centos/centos-7.3-1611.json b/resources/tools/disk-image-builder/centos/centos-7.3-1611.json index da22c749d4..a747df9938 100644 --- a/resources/tools/disk-image-builder/centos/centos-7.3-1611.json +++ b/resources/tools/disk-image-builder/centos/centos-7.3-1611.json @@ -80,6 +80,10 @@ }, { "type": "shell", + "script": "scripts-remote/disable_ipv6.sh" + }, + { + "type": "shell", "script": "scripts-remote/cleanup.sh" } ], diff --git a/resources/tools/disk-image-builder/centos/scripts-remote/disable_ipv6.sh b/resources/tools/disk-image-builder/centos/scripts-remote/disable_ipv6.sh new file mode 100644 index 0000000000..43e59787a7 --- /dev/null +++ b/resources/tools/disk-image-builder/centos/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/centos/scripts-remote/serial-console-centos-7-1511.sh b/resources/tools/disk-image-builder/centos/scripts-remote/serial-console-centos-7-1511.sh index 457e77cdee..6107db99dc 100644 --- a/resources/tools/disk-image-builder/centos/scripts-remote/serial-console-centos-7-1511.sh +++ b/resources/tools/disk-image-builder/centos/scripts-remote/serial-console-centos-7-1511.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/systemd/system/serial-getty-digi@.service <<"_EOF" # ttyS0 - getty # @@ -69,7 +69,7 @@ GRUB_DEFAULT=0 GRUB_TIMEOUT=5 GRUB_DISABLE_SUBMENU=true GRUB_DISTRIBUTOR="$(sed 's, release .*$,,g' /etc/system-release)" -GRUB_CMDLINE_LINUX="rhgb quiet console=tty0 console=ttyS0,115200n8 ipv6.disable=1" +GRUB_CMDLINE_LINUX="rhgb quiet console=tty0 console=ttyS0,115200n8" GRUB_TERMINAL=serial GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1" |