Add x-systemd

Change-Id: I710f1e7b6f0f5a7fedde1c0229eeab89e80e65d5

diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh
index 1c18b89..6a152fd 100644 (file)
--- a/packer/provision/agl_dependencies.sh
+++ b/packer/provision/agl_dependencies.sh
@@ -20,7 +20,7 @@ echo "---> Removing Vexxhost Ubuntu mirrors"
 sed -i 's/ubuntu.mirror.vexxhost.com/us.archive.ubuntu.com/g' /etc/apt/sources.list
 
 # UPDATE things
-sed -i -e "s,xenial,focal,g" /etc/apt/sources.list
+sed -i -e "s,xenial,jammy,g" /etc/apt/sources.list
 sync
 cat /etc/apt/sources.list
 

diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh
index 0ca4e7e..7c13ae6 100644 (file)
--- a/packer/provision/basebuild.sh
+++ b/packer/provision/basebuild.sh
@@ -15,8 +15,10 @@ cat <<EOFSTAB >> /etc/fstab
 # tmp should be tmpfs so gcc tmpfiles do not hit the disk
 none /tmp tmpfs defaults 0 0
 
-10.30.73.73:/srv/tank /mnt/tank  nfs vers=3,x-systemd.mount-timeout=5,x-systemd.device-timeout=5,auto,async,nofail,noatime,nolock,rsize=8192,wsize=8192,sec=sys,intr,_netdev 0 0
-10.30.73.73:/srv/tank /mnt/tank2 nfs vers=3,x-systemd.mount-timeout=5,x-systemd.device-timeout=5,auto,async,nofail,noatime,nolock,rsize=8192,wsize=8192,sec=sys,intr,_netdev 0 0
+#10.30.73.73:/srv/tank /mnt/tank  nfs vers=3,x-systemd.mount-timeout=5,x-systemd.device-timeout=5,auto,async,nofail,noatime,nolock,rsize=8192,wsize=8192,sec=sys,intr,_netdev 0 0
+#10.30.73.73:/srv/tank /mnt/tank2 nfs vers=3,x-systemd.mount-timeout=5,x-systemd.device-timeout=5,auto,async,nofail,noatime,nolock,rsize=8192,wsize=8192,sec=sys,intr,_netdev 0 0
+10.30.73.73:/srv/tank /mnt/tank  nfs auto,vers=3,nofail,noatime,intr,actimeo=1800,async,rsize=8192,wsize=8192,sec=sys,_netdev 0 0
+10.30.73.73:/srv/tank /mnt/tank2 nfs auto,vers=3,nofail,noatime,nolock,intr,tcp,actimeo=1800,_netdev 0 0
 #                                    vers=3,auto,nofail,noatime,nolock,intr,tcp,actimeo=1800
 
 EOFSTAB