diff packages.py @ 240:b58f05be720a

updates for new ubuntu 23.10 install
author drewp@bigasterisk.com
date Mon, 11 Dec 2023 21:22:12 -0800
parents 83573e3350bd
children cb9dce5b0731
line wrap: on
line diff
--- a/packages.py	Sat Dec 02 18:38:56 2023 -0800
+++ b/packages.py	Mon Dec 11 21:22:12 2023 -0800
@@ -53,7 +53,7 @@
     systemd.service(service='nginx', enabled=False, running=False)
 
 
-kw = dict(latest=True)
+kw = dict(present=True, latest=True)
 
 apt.packages(packages=package_lists.setup, **kw)
 
@@ -82,12 +82,6 @@
 if host.name == 'plus':
     apt.packages(packages=package_lists.laptop, **kw)
 
-desktop_env = host.name in ['dash', 'slash', 'plus', 'squib']
-if desktop_env:
-    apt.packages(packages=package_lists.xorg + package_lists.desktop, **kw)
-    apt.deb(src="http://mirrors.kernel.org/ubuntu/pool/universe/libp/libpod/podman_4.3.1+ds1-5ubuntu1_amd64.deb")
-    apt.deb(src="http://mirrors.kernel.org/ubuntu/pool/universe/libp/libpod/podman-docker_4.3.1+ds1-5ubuntu1_amd64.deb")
-    pdm()
 
 if not is_pi:
     apt.packages(packages=package_lists.non_pi, **kw)
@@ -98,4 +92,9 @@
     files.template(src="templates/pigpiod.service.j2", dest="/etc/systemd/system/pigpiod.service")
     systemd.service(service='pigpiod', daemon_reload=True, enabled=True)
 
+desktop_env = host.name in ['dash', 'slash', 'plus', 'squib']
+if desktop_env:
+    apt.packages(packages=package_lists.xorg + package_lists.desktop, **kw)
+    pdm()
+
 no_unwanted_services()