diff --git a/roles/fai/defaults/main.yml b/roles/fai/defaults/main.yml index 18aed0f..89782ad 100644 --- a/roles/fai/defaults/main.yml +++ b/roles/fai/defaults/main.yml @@ -33,6 +33,12 @@ fai_squashfs_path: "{{ fai_dir_download + '/' + fai_squashfs_file }}" fai_loguser: fai_menu_default: 'HW4F Desktop Jammy' fai_nfsroot_force_rebuild: false +#fai_flags: [verbose,sshd,createvt,menu,debug,reboot] +fai_flags: + - verbose + - sshd + - createvt + - menu fai_hw4f_password_salt: "toXu6kiez1haetan" fai_hw4f_rootpw_fai: "fai" diff --git a/roles/fai/templates/menu.ipxe.j2 b/roles/fai/templates/menu.ipxe.j2 index 7951646..46fe76a 100644 --- a/roles/fai/templates/menu.ipxe.j2 +++ b/roles/fai/templates/menu.ipxe.j2 @@ -68,7 +68,14 @@ exit :fai kernel ${boot-root}/{{ fai_live_vmlinuz }} initrd ${boot-root}/{{ fai_live_initrd }} || goto reload_after_fail -imgargs {{ fai_live_vmlinuz|basename }} ip=dhcp root=live:{{ http_mirror_fai_squashfs_url }} FAI_FLAGS=verbose,sshd,createv,menu FAI_CONFIG_SRC={{ http_mirror_fai_profiles_url }} FAI_ACTION=install net.ifnames=0 +imgargs {{ fai_live_vmlinuz | basename }} ip=dhcp root=live:{{ http_mirror_fai_squashfs_url }} FAI_FLAGS={{ fai_flags | join(',') }} FAI_CONFIG_SRC={{ http_mirror_fai_profiles_url }} FAI_ACTION=install net.ifnames=0 +boot || goto reload_after_fail +goto start + +:fai+reboot +kernel ${boot-root}/{{ fai_live_vmlinuz }} +initrd ${boot-root}/{{ fai_live_initrd }} || goto reload_after_fail +imgargs {{ fai_live_vmlinuz | basename }} ip=dhcp root=live:{{ http_mirror_fai_squashfs_url }} FAI_FLAGS={{{ fai_flags | join(',') }},reboot FAI_CONFIG_SRC={{ http_mirror_fai_profiles_url }} FAI_ACTION=install net.ifnames=0 boot || goto reload_after_fail goto start diff --git a/roles/fai/templates/srv/fai/config/class/HW4F_DESKTOP.var.j2 b/roles/fai/templates/srv/fai/config/class/HW4F_DESKTOP.var.j2 index 8d65370..eb7ea17 100644 --- a/roles/fai/templates/srv/fai/config/class/HW4F_DESKTOP.var.j2 +++ b/roles/fai/templates/srv/fai/config/class/HW4F_DESKTOP.var.j2 @@ -20,6 +20,8 @@ USERPW='{{ fai_hw4f_profile_password SUPRESS_GNOME_INITIAL_SCREEN=1 +### ALREADY SET IN IPXE MENU ON KERNEL CMDLINE +#FAI_FLAGS="verbose sshd createvt menu " FAI_ALLOW_UNSIGNED=0 APTPROXY=http://{{ server_name }}:3142