diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-15 01:30:43 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-15 01:30:43 +0000 |
| commit | f218f8bfc4fa26ec042e9510d38327906b50d303 (patch) | |
| tree | 84afbfa70136e7e7c79837e1f7b89a5cab591fdd | |
| parent | 8473901ffd8ac4c88be3f92a613a628106f531f1 (diff) | |
| parent | 4c029b94d260846e3f70018483dbbe310a746817 (diff) | |
| download | tests-f218f8bfc4fa26ec042e9510d38327906b50d303.tar.gz | |
Snap for 9744603 from 4c029b94d260846e3f70018483dbbe310a746817 to udc-release
Change-Id: I008527ddfea3788dd731bcbe81b99fe76be6d15d
| -rw-r--r-- | net/test/rootfs/bullseye-server.list | 2 | ||||
| -rwxr-xr-x | net/test/rootfs/bullseye-server.sh | 25 |
2 files changed, 26 insertions, 1 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 8e0e3ab..c5343de 100755 --- a/net/test/rootfs/bullseye-server.sh +++ b/net/test/rootfs/bullseye-server.sh @@ -43,7 +43,12 @@ update_apt_sources "bullseye bullseye-backports" "non-free" setup_cuttlefish_user # Install JRE -apt-get install -y openjdk-11-jre +apt-get install -y openjdk-17-jre + +# Ubuntu compatibility +cat >>/etc/skel/.profile << EOF +PATH="/usr/sbin:\$PATH" +EOF # Get kernel and QEMU from backports for package in linux-image-${arch} qemu-system-arm qemu-system-x86; do @@ -97,5 +102,23 @@ 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 +apt-get install -y network-manager apt-get purge -y vim-tiny bullseye_cleanup |