diff options
| author | Alistair Delva <adelva@google.com> | 2023-03-13 20:35:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-13 20:35:03 +0000 |
| commit | 4c029b94d260846e3f70018483dbbe310a746817 (patch) | |
| tree | 84afbfa70136e7e7c79837e1f7b89a5cab591fdd | |
| parent | 57da4ff1d88f1162c19c40fbca5ac56e26266119 (diff) | |
| parent | 8ac65470fe4767b41ed1d6545fa883294748ff3c (diff) | |
| download | tests-4c029b94d260846e3f70018483dbbe310a746817.tar.gz | |
build_rootfs.sh: bullseye-server: Add NTP, use UTC am: 58a58585b4 am: b54ac65ca3 am: 8ac65470fe
Original change: https://android-review.googlesource.com/c/kernel/tests/+/2453769
Change-Id: I595f2135f4d62190888841fa728601426c33dc3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | net/test/rootfs/bullseye-server.list | 2 | ||||
| -rwxr-xr-x | net/test/rootfs/bullseye-server.sh | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/net/test/rootfs/bullseye-server.list b/net/test/rootfs/bullseye-server.list index 4281891..adea7b8 100644 --- a/net/test/rootfs/bullseye-server.list +++ b/net/test/rootfs/bullseye-server.list @@ -6,6 +6,8 @@ gcc gdisk libglvnd0 make +ntpdate +ntpstat screen software-properties-common unzip diff --git a/net/test/rootfs/bullseye-server.sh b/net/test/rootfs/bullseye-server.sh index 93e0f30..c5343de 100755 --- a/net/test/rootfs/bullseye-server.sh +++ b/net/test/rootfs/bullseye-server.sh @@ -102,6 +102,20 @@ create_systemd_getty_symlinks ttyAMA0 ttyS0 setup_grub "net.ifnames=0 console=ttyAMA0 8250.nr_uarts=1 console=ttyS0 loglevel=4 amdgpu.runpm=0 amdgpu.dc=0" +# Set up NTP using Google time servers and switch to UTC for uniformity +# NOTE: Installing ntp removes systemd-timesyncd +apt-get install -y ntp +sed -i -e 's,^\(pool .*debian.*\)$,# \1,' /etc/ntp.conf +cat >>/etc/ntp.conf <<EOF +pool time1.google.com iburst +pool time2.google.com iburst +pool time3.google.com iburst +pool time4.google.com iburst +# time.google.com as backup +pool time.google.com iburst +EOF +timedatectl set-timezone UTC + # Switch to NetworkManager. To disrupt the bootstrapping the least, do this # right at the end.. rm -f /etc/network/interfaces.d/eth0.conf |