6 files changed, 67 insertions, 28 deletions

diff --git a/host_vars/archiso.local.yml.example b/host_vars/archiso.local.yml.example
index 0dd53e7..d3967b0 100644
--- a/host_vars/archiso.local.yml.example
+++ b/host_vars/archiso.local.yml.example
@@ -1,7 +1,7 @@
 ---
 hostname: "archlinux.local"
-partition_disk: "/dev/sda"
-partition_wipe: false
+partition_disk: "/dev/nvme0n1"
+partition_wipe: true
 partition_boot:
   num: 1
   name: "boot"
@@ -10,7 +10,7 @@ partition_boot:
   part_end: "1.0GiB"
   fstype: "vfat"
   fstype_opts: "-F 32"
-  dev: "{{ partition_disk }}1"
+  dev: "{{ partition_disk }}p1"
   mount_path: "/mnt/boot/efi"
   fstab_opts: "defaults,nodev,nosuid,noexec,umask=0077"
 partition_swap:
@@ -20,27 +20,22 @@ partition_swap:
   part_start: "1.0GiB"
   part_end: "9.0GiB"
   fstype: "ext4"
-  dev: "{{ partition_disk }}2"
+  dev: "{{ partition_disk }}p2"
   mount_path: "none"
 partition_root:
-  num: 4
+  num: 3
   name: "arch-root"
-  part_start: "59.0GiB"
+  part_start: "9.0GiB"
   part_end: "109.0GiB"
   fstype: "ext4"
-  dev: "{{ partition_disk }}4"
+  dev: "{{ partition_disk }}p3"
   mount_path: "/mnt"
 partition_extras:
-  - num: 3
-    name: "ubuntu-root"
-    part_start: "9.0GiB"
-    part_end: "59.0GiB"
-    fstype: "ext4"
-    dev: "{{ partition_disk }}3"
-  - num: 5
+  - num: 4
     name: "home"
     part_start: "109.0GiB"
     part_end: "100%"
     fstype: "ext4"
-    dev: "{{ partition_disk }}4"
+    dev: "{{ partition_disk }}p4"
+    mount_path: "/mnt/home"
 configure_playbook_dir: "../ansible-distro-configure"
diff --git a/host_vars/mubuntuiso.local.yml b/host_vars/mubuntuiso.local.yml
new file mode 100644
index 0000000..9cee75e
--- /dev/null
+++ b/host_vars/mubuntuiso.local.yml
diff --git a/host_vars/mubuntuiso.local.yml.example b/host_vars/mubuntuiso.local.yml.example
new file mode 100644
index 0000000..704bffe
--- /dev/null
+++ b/host_vars/mubuntuiso.local.yml.example
@@ -0,0 +1,48 @@
+---
+hostname: "mubuntu.local"
+partition_disk: "/dev/sda"
+partition_wipe: false
+partition_boot:
+  num: 1
+  name: "boot"
+  flags: [boot, esp]
+  part_start: "0%"
+  part_end: "1.0GiB"
+  fstype: "vfat"
+  fstype_opts: "-F 32"
+  dev: "{{ partition_disk }}1"
+  mount_path: "/mnt/boot/efi"
+  fstab_opts: "defaults,nodev,nosuid,noexec,umask=0077"
+partition_swap:
+  num: 2
+  name: "swap"
+  flags: [swap]
+  part_start: "1.0GiB"
+  part_end: "9.0GiB"
+  fstype: "ext4"
+  dev: "{{ partition_disk }}2"
+  mount_path: "none"
+partition_root:
+  num: 3
+  name: "ubuntu-root"
+  part_start: "9.0GiB"
+  part_end: "59.0GiB"
+  fstype: "ext4"
+  dev: "{{ partition_disk }}3"
+  mount_path: "/mnt"
+partition_extras:
+  - num: 4
+    name: "arch-root"
+    part_start: "59.0GiB"
+    part_end: "109.0GiB"
+    fstype: "ext4"
+    dev: "{{ partition_disk }}4"
+  - num: 5
+    name: "home"
+    part_start: "109.0GiB"
+    part_end: "100%"
+    fstype: "ext4"
+    dev: "{{ partition_disk }}5"
+    mount_path: "/mnt/home"
+bootstrap_mac: true
+configure_playbook_dir: "../ansible-distro-configure"
diff --git a/host_vars/ubuntuiso.local.yml b/host_vars/ubuntuiso.local.yml
index 7484e67..20831bf 100644
--- a/host_vars/ubuntuiso.local.yml
+++ b/host_vars/ubuntuiso.local.yml
diff --git a/host_vars/ubuntuiso.local.yml.example b/host_vars/ubuntuiso.local.yml.example
index 00f1c52..51b5456 100644
--- a/host_vars/ubuntuiso.local.yml.example
+++ b/host_vars/ubuntuiso.local.yml.example
@@ -1,7 +1,7 @@
 ---
 hostname: "ubuntu.local"
-partition_disk: "/dev/sda"
-partition_wipe: false
+partition_disk: "/dev/nvme0n1"
+partition_wipe: true
 partition_boot:
   num: 1
   name: "boot"
@@ -10,7 +10,7 @@ partition_boot:
   part_end: "1.0GiB"
   fstype: "vfat"
   fstype_opts: "-F 32"
-  dev: "{{ partition_disk }}1"
+  dev: "{{ partition_disk }}p1"
   mount_path: "/mnt/boot/efi"
   fstab_opts: "defaults,nodev,nosuid,noexec,umask=0077"
 partition_swap:
@@ -20,28 +20,22 @@ partition_swap:
   part_start: "1.0GiB"
   part_end: "9.0GiB"
   fstype: "ext4"
-  dev: "{{ partition_disk }}2"
+  dev: "{{ partition_disk }}p2"
   mount_path: "none"
 partition_root:
   num: 3
   name: "ubuntu-root"
   part_start: "9.0GiB"
-  part_end: "59.0GiB"
+  part_end: "109.0GiB"
   fstype: "ext4"
-  dev: "{{ partition_disk }}3"
+  dev: "{{ partition_disk }}p3"
   mount_path: "/mnt"
 partition_extras:
   - num: 4
-    name: "arch-root"
-    part_start: "59.0GiB"
-    part_end: "109.0GiB"
-    fstype: "ext4"
-    dev: "{{ partition_disk }}4"
-  - num: 5
     name: "home"
     part_start: "109.0GiB"
     part_end: "100%"
     fstype: "ext4"
-    dev: "{{ partition_disk }}5"
+    dev: "{{ partition_disk }}p4"
     mount_path: "/mnt/home"
 configure_playbook_dir: "../ansible-distro-configure"
diff --git a/inventory/hosts.yml b/inventory/hosts.yml
index d219b43..447ed16 100644
--- a/inventory/hosts.yml
+++ b/inventory/hosts.yml
@@ -10,5 +10,7 @@ live_environments:
       ansible_user: root
     ubuntuiso.local:
       ansible_user: ubuntu
+    mubuntuiso.local:
+      ansible_user: ubuntu
     raspberryiso.local:
       ansible_user: pi