Merge branch 'liw/fixes' into 'main'

fix various issues when testing on my x220

See merge request larswirzenius/v-i!48

4 files changed, 29 insertions, 14 deletions

diff --git a/installer-ansible.yml b/installer-ansible.yml
index 4227437..8e99730 100644
--- a/installer-ansible.yml
+++ b/installer-ansible.yml
@@ -66,7 +66,7 @@
       apt:
         name: vmdb2
 
-    # Local specific configuration.
+    # Locale specific configuration.
 
     - name: "configure keyboard layout"
       copy:
diff --git a/installer.vmdb b/installer.vmdb
index eb88a9f..f4f7244 100644
--- a/installer.vmdb
+++ b/installer.vmdb
@@ -65,14 +65,14 @@ steps:
 
   - fstab: root
 
-  - copy-file: /root/v-i
+  - copy-file: /bin//v-i
     src: v-i
     perm: 0755
 
-  - copy-file: /root/std.yml
+  - copy-file: /usr/share/v-i/std.yml
     src: std.yml
 
-  - copy-file: /root/get-authorized-keys
+  - copy-file: /bin/get-authorized-keys
     src: get-authorized-keys
     perm: 0755
 
diff --git a/v-i b/v-i
index c140089..e9aa83f 100755
--- a/v-i
+++ b/v-i
@@ -252,7 +252,7 @@ def grub(device, root, efi):
     }
 
 
-def vmdb_spec(system, ansible_vars):
+def vmdb_spec(system, ansible_vars, std_yml):
     device = "{{ image }}"
     steps = [
         # Create partition table.
@@ -277,11 +277,11 @@ def vmdb_spec(system, ansible_vars):
                 cryptsetup("cryptsetup0", system.luks, "pv0"),
             ]
         )
-        for (i, drive) in enumerate(system.extra_drives):
+        for i, drive in enumerate(system.extra_drives):
             steps.append(cryptsetup(f"cryptsetuo{i+1}", system.luks, f"pv{i+1}"))
     else:
         steps.append(mkpart(device, "pv0", "1G", "100%"))
-        for (i, drive) in enumerate(system.extra_drives):
+        for i, drive in enumerate(system.extra_drives):
             steps.extend(
                 [
                     mklabel(drive),
@@ -373,7 +373,7 @@ def vmdb_spec(system, ansible_vars):
     )
 
     # If playbooks have been specified, add ansible steps.
-    for p in ["std.yml"] + system.extra_playbooks:
+    for p in [std_yml] + system.extra_playbooks:
         if p:
             steps.append({"ansible": "root", "playbook": p, "extra_vars": ansible_vars})
 
@@ -470,10 +470,25 @@ def main():
     timings = Timings()
 
     p = argparse.ArgumentParser()
-    p.add_argument("--verbose", action="store_true")
-    p.add_argument("--very-verbose", action="store_true")
-    p.add_argument("--log", default="install.log")
-    p.add_argument("--cache", default=None)
+    p.add_argument(
+        "-v", "--verbose", action="store_true", help="report to stdout what's happening"
+    )
+    p.add_argument(
+        "--very-verbose", action="store_true", help="be more verbose to stdout"
+    )
+    p.add_argument(
+        "--log", default="install.log", help="log to file LOG (default is no log file)"
+    )
+    p.add_argument(
+        "--cache",
+        default=None,
+        help="use CACHE to cache debootstrap output (default is computed from spec file content)",
+    )
+    p.add_argument(
+        "--std-yml",
+        default="/usr/share/v-i/std.yml",
+        help="Ansible playbook for standard system (%(default)s)",
+    )
     p.add_argument("spec")
     args = p.parse_args()
 
@@ -507,7 +522,7 @@ def main():
     clean_up_disks([system.drive] + system.extra_drives)
     timings.reached("clean up storage")
 
-    vmdb = vmdb_spec(system, ansible_vars)
+    vmdb = vmdb_spec(system, ansible_vars, args.std_yml)
     tmp = tempfile.mkdtemp()
     specfile = os.path.join(tmp, "spec.yaml")
     if args.very_verbose:
diff --git a/v-i-config.service b/v-i-config.service
index 92b5bad..93d51c0 100644
--- a/v-i-config.service
+++ b/v-i-config.service
@@ -6,4 +6,4 @@ WantedBy=ssh.service
 
 [Service]
 Type=oneshot
-ExecStart=/root/get-authorized-keys
+ExecStart=/bin/get-authorized-keys