Merge branch 'x' into 'main'

fix: install requested packages, not a fixed list

See merge request larswirzenius/v-i!9

2 files changed, 2 insertions, 47 deletions

diff --git a/v-i b/v-i
index 7bdd144..5197acf 100755
--- a/v-i
+++ b/v-i
@@ -214,17 +214,7 @@ def debootstrap(tag):
 def apt(tag, packages, unless=True):
     d = {
         "apt": "install",
-        "packages": [
-            "console-setup",
-            "dosfstools",
-            "linux-image-amd64",
-            "locales-all",
-            "lvm2",
-            "psmisc",
-            "python3",
-            "ssh",
-            "strace",
-        ],
+        "packages": packages,
         "tag": tag,
     }
     if unless:
@@ -393,7 +383,7 @@ class SystemSpec:
             "extra_lvs": [],
             "extra_playbooks": [],
             "ansible_vars": {},
-            "luks": None,
+            "luks": "",
         }
         with open(filename) as f:
             obj = yaml.safe_load(f)
diff --git a/x220.yml b/x220.yml
deleted file mode 100644
index 0400fc9..0000000
--- a/x220.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-- hosts: image
-  tasks:
-    - name: "install software"
-      apt:
-        name:
-          - bridge-utils
-    - name: "delete external.network"
-      file:
-        path: /etc/systemd/network/external.network
-        state: absent
-    - name: "add br0.netdev"
-      copy:
-        content: |
-          [NetDev]
-          Name=br0
-          Kind=bridge
-        dest: /etc/systemd/network/br0.netdev
-    - name: "bind eth0 to bridge br0"
-      copy:
-        content: |
-          [Match]
-          Name=eth0
-
-          [Network]
-          Bridge=br0
-        dest: /etc/systemd/network/bind.network
-    - name: "have br0 get address with DHCP"
-      copy:
-        content: |
-          [Match]
-          Name=br0
-
-          [Network]
-          DHCP=yes
-        dest: /etc/systemd/network/br0.network