Switching how we detect efi boot device for convert script

Signed-off-by: Fabian Arrotin <[email protected]>

adhoc-init-node.yml

@@ -1,6 +1,12 @@
 ---
 - hosts: all
+  vars_prompt:
+    - name: "warning_message"
+      prompt: "[WARNING] : have you called this script with --limit to apply only to some nodes/groups ? CTRL+C if not the case" 
+      private: no
   become: True
+  gather_facts: True
+
   tasks:
     - block: 
       - name: Find our public ip

templates/convert-to-rhel

@@ -23,12 +23,13 @@ else
   else
     if [ -d /sys/firmware/efi ] ; then
       f_log "UEFI system detected, forcing efibootmanager"
-      efi_dev=$(mount|grep "boot/efi"|awk '{print $1}') 
-      f_log "Detected EFI boot device is [${efi_dev:0:-1}]"
+      efi_dev=$(lsblk -dno pkname $(mount|grep "boot/efi"|awk '{print $1}')) 
+      f_log "Detected EFI boot device is [/dev/${efi_dev}]"
       grub2-mkconfig -o /boot/efi/EFI/redhat/grub.cfg
-      efibootmgr --create --disk=${efi_dev:0:-1} --part=1 --label="Red Hat Enterprise Linux" --loader='EFI\redhat\shimx64.efi' >> $logfile
+      efibootmgr --create --disk=/dev/${efi_dev} --part=1 --label="Red Hat Enterprise Linux" --loader='EFI\redhat\shimx64.efi' >> $logfile
       if [ "$?" -ne "0" ] ; then
         f_log "ERROR, not able to configure efibootmgr so machine will not reboot"
+        exit 1
       fi
     fi
     exit 2