From 7e4e6cfff41fa53c06f12fa73b80fc9d640fdfe8 Mon Sep 17 00:00:00 2001 From: Hironori Shiina Date: Fri, 6 Jul 2018 13:30:28 +0900 Subject: [PATCH] Add expected semicolons for dhclient.conf This patch adds an expected semicolon to an end of statement in dhclient.conf for dhcp-all-interfaces element. Without this fix, an error occurs when an image is booted with a message, 'semicolon expected.'. Change-Id: I8311dbc67cc2815223111da01e7a7517c7d6f059 --- .../dhcp-all-interfaces/install.d/50-dhcp-all-interfaces | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diskimage_builder/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces b/diskimage_builder/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces index bbbd74e79..439a79001 100755 --- a/diskimage_builder/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces +++ b/diskimage_builder/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces @@ -17,9 +17,9 @@ fi if [ -f /etc/dhcp/dhclient.conf ] ; then # Set the dhclient timeout configurations to match DIB_DHCP_TIMEOUT, if grep -o "^timeout " /etc/dhcp/dhclient.conf ; then - sed -i -e "s/^timeout .*/# \"timeout\" Value set by dhcp-all-interfaces\ntimeout ${DIB_DHCP_TIMEOUT:-30}/" /etc/dhcp/dhclient.conf + sed -i -e "s/^timeout .*/# \"timeout\" Value set by dhcp-all-interfaces\ntimeout ${DIB_DHCP_TIMEOUT:-30};/" /etc/dhcp/dhclient.conf else - echo -e "# \"timeout\" Value set by dhcp-all-interfaces\ntimeout ${DIB_DHCP_TIMEOUT:-30}" >> /etc/dhcp/dhclient.conf + echo -e "# \"timeout\" Value set by dhcp-all-interfaces\ntimeout ${DIB_DHCP_TIMEOUT:-30};" >> /etc/dhcp/dhclient.conf fi fi