aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/disk-image-builder/ubuntu/scripts-remote
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2018-11-14 09:14:05 +0000
committerJan Gelety <jgelety@cisco.com>2018-11-23 15:37:30 +0000
commitb417beabd253e93d494075f7474343e8c3ac3f34 (patch)
treead278eab39ff22a2cfab3cc92ba89f6467092eb2 /resources/tools/disk-image-builder/ubuntu/scripts-remote
parent7947526242a1e6149f623af96cfcb696a313c4db (diff)
Adding python-cffi requirements
- Introduce Ubuntu 18.04.5 VIRL image - FIX mac addresses for dhcp - Add ansible task for python-cffi install on perf testbeds Change-Id: I8acfcdc8ee97c13ad4795a4ccde868a96b3fee47 Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/tools/disk-image-builder/ubuntu/scripts-remote')
-rw-r--r--resources/tools/disk-image-builder/ubuntu/scripts-remote/cleanup.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/resources/tools/disk-image-builder/ubuntu/scripts-remote/cleanup.sh b/resources/tools/disk-image-builder/ubuntu/scripts-remote/cleanup.sh
index 850c6958fb..4c713a581f 100644
--- a/resources/tools/disk-image-builder/ubuntu/scripts-remote/cleanup.sh
+++ b/resources/tools/disk-image-builder/ubuntu/scripts-remote/cleanup.sh
@@ -1,6 +1,6 @@
#!/bin/sh -e
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2018 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:
@@ -28,7 +28,10 @@ fi
passwd -d root
passwd -l root
rm -f /etc/resolv.conf
-pkill dhclient
+# Disabling due to bug in dhclient
+# https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1779721
+# This is causing problem that dhclient is not running properly.
+#pkill dhclient
rm -f /var/lib/dhcp/*leases
echo "********** SCHEDULING SHUTDOWN IN 1 MINUTE **********"