diff options
| author |   Alex Yang <yangyang1@zte.com.cn> | 2017-12-26 03:44:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-26 03:44:35 +0000 |
| commit | 26df202d264c46e13ccbf0ab9502e7b48c73d1cf (patch) | |
| tree | b6dbf82e335bdf27e41209795a0f61a4bdc8890f | |
| parent | 6c6d834baf09bfe58266d58a84b1cd85dbd5e249 (diff) | |
| parent | b9ed9708b534dba3ffb16ba9a302c25e89de045b (diff) | |
Merge "Use deployserver's timezone in daisy VM"
| -rwxr-xr-x | tools/centos-img-modify.sh | 5 | ||||
| -rwxr-xr-x | tools/daisy-img-modify.sh | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/tools/centos-img-modify.sh b/tools/centos-img-modify.sh index 31f122fb..fe35126b 100755 --- a/tools/centos-img-modify.sh +++ b/tools/centos-img-modify.sh @@ -63,3 +63,8 @@ cat << EOF > /etc/cloud/cloud.cfg.d/default.cfg disable_root: False ssh_pwauth: True EOF + +cd /etc +if [ ! -z $localtime_file ] && [ -f $localtime_file ]; then + ln -s -f $localtime_file /etc/localtime +fi diff --git a/tools/daisy-img-modify.sh b/tools/daisy-img-modify.sh index aad29949..43fd186b 100755 --- a/tools/daisy-img-modify.sh +++ b/tools/daisy-img-modify.sh @@ -186,6 +186,12 @@ setup() { chroot $mountdir df -h cp $cmd $mountdir/$(basename $cmd) + + if [ -h /etc/localtime ]; then + export localtime_file=$(ls -l /etc/localtime | grep "^l" | awk '{print $11}') + elif [ -f /etc/localtime ]; then + cp /etc/loccaltime $mountdir/etc/ + fi } # modify image running a script using in a chrooted environment |