diff options
Diffstat (limited to 'roles/installer/debian')
| -rw-r--r-- | roles/installer/debian/base/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/installer/debian/iso/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/installer/debian/preseed/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/installer/debian/preseed/templates/partman_config.j2 | 4 | ||||
| -rw-r--r-- | roles/installer/debian/usb/tasks/main.yml | 12 |
5 files changed, 11 insertions, 11 deletions
diff --git a/roles/installer/debian/base/tasks/main.yml b/roles/installer/debian/base/tasks/main.yml index 662b8acb..56ca7dc0 100644 --- a/roles/installer/debian/base/tasks/main.yml +++ b/roles/installer/debian/base/tasks/main.yml @@ -17,7 +17,7 @@ src: "{{ item }}" dest: "{{ installer_base_path }}/keyrings/{{ item | basename }}" -- name: copy ubuntu keyring file +- name: copy ubuntu archive keyring file copy: src: "{{ global_files_dir }}/common/keyrings/ubuntu-archive.gpg" dest: "{{ installer_base_path }}/keyrings/ubuntu-archive.gpg" diff --git a/roles/installer/debian/iso/tasks/main.yml b/roles/installer/debian/iso/tasks/main.yml index 3170c7b5..04d913c3 100644 --- a/roles/installer/debian/iso/tasks/main.yml +++ b/roles/installer/debian/iso/tasks/main.yml @@ -4,7 +4,7 @@ vars: debian_installer_distro: "{{ install_distro }}" debian_installer_codename: "{{ install_codename }}" - debian_installer_arch: "{{ install.arch | default('amd64') }}" + debian_installer_arch: "{{ install_cooked.arch | default('amd64') }}" debian_installer_variant: mini-iso import_role: role: installer/debian/fetch diff --git a/roles/installer/debian/preseed/defaults/main.yml b/roles/installer/debian/preseed/defaults/main.yml index b8d22ea6..a0646b3b 100644 --- a/roles/installer/debian/preseed/defaults/main.yml +++ b/roles/installer/debian/preseed/defaults/main.yml @@ -1,5 +1,5 @@ --- -# preseed_initrd +# preseed_initrd: # preseed_tmpdir: preseed_language: en diff --git a/roles/installer/debian/preseed/templates/partman_config.j2 b/roles/installer/debian/preseed/templates/partman_config.j2 index 9f8c7dcd..39003864 100644 --- a/roles/installer/debian/preseed/templates/partman_config.j2 +++ b/roles/installer/debian/preseed/templates/partman_config.j2 @@ -48,14 +48,14 @@ d-i partman-auto/method string lvm d-i partman-auto/expert_recipe string \ ansible :: \ {% if (install_cooked.efi | default(false)) %} -{% set efi_esp_size_mb = (((preseed_efi_esp_size | default(preseed_efi_esp_size)) | human_to_bytes) / (1024*1024)) | int %} +{% set efi_esp_size_mb = ((preseed_efi_esp_size | human_to_bytes) / (1024*1024)) | int %} {{ efi_esp_size_mb }} {{ efi_esp_size_mb }} {{ efi_esp_size_mb }} fat16 \ $primary{ } $bootable{ } \ method{ efi } format{ } \ . \ {% endif %} {% if install_cooked.disks.primary == "software-raid" %} -{% set swraid_boot_size_mb = (((preseed_swraid_boot_size | default(preseed_swraid_boot_size)) | human_to_bytes) / (1024*1024)) | int %} +{% set swraid_boot_size_mb = ((preseed_swraid_boot_size | human_to_bytes) / (1024*1024)) | int %} {{ swraid_boot_size_mb }} {{ swraid_boot_size_mb }} {{ swraid_boot_size_mb }} raid \ $lvmignore{ } $primary{ } $bootable{ } \ method{ raid } \ diff --git a/roles/installer/debian/usb/tasks/main.yml b/roles/installer/debian/usb/tasks/main.yml index e02f38e6..62bfced7 100644 --- a/roles/installer/debian/usb/tasks/main.yml +++ b/roles/installer/debian/usb/tasks/main.yml @@ -8,15 +8,15 @@ - name: fail if usb drive mountpoint does not exist run_once: true assert: - that: usb_install_mountpoint.stat.exists - msg: the path to the usb drive does not exist + that: usb_install_mountpoint.stat.exists and usb_install_mountpoint.stat.isdir + msg: the path to the usb drive does not exist or is not a directory - name: download installer run_once: true vars: debian_installer_distro: "{{ install_distro }}" debian_installer_codename: "{{ install_codename }}" - debian_installer_arch: "{{ install.arch | default('amd64') }}" + debian_installer_arch: "{{ install_cooked.arch | default('amd64') }}" debian_installer_variant: netboot import_role: role: installer/debian/fetch @@ -109,12 +109,12 @@ $ sudo syslinux -i /dev/CHANGEME1 -d bios $ sudo fdisk /dev/CHANGEME [Here, make sure partition 1 is marked bootable.] - $ cp /usr/lib/syslinux/modules/bios/* {{ usb_install_path }}/bios/ + $ cp /usr/lib/syslinux/modules/bios/* {{ (usb_install_path, 'bios/') | path_join }} for UEFI these steps need to be done $ sudo apt install syslinux-efi - $ cp /usr/lib/syslinux/modules/efi64/* {{ usb_install_path }}/EFI/boot/ - $ cp /usr/lib/SYSLINUX.EFI/efi64/syslinux.efi {{ usb_install_path }}/EFI/boot/bootx64.efi + $ cp /usr/lib/syslinux/modules/efi64/* {{ (usb_install_path, 'EFI/boot/') | path_join }} + $ cp /usr/lib/SYSLINUX.EFI/efi64/syslinux.efi {{ (usb_install_path, 'EFI/boot/bootx64.efi') | path_join }} This will NOT be done automatically. |