fix pull request screw up

Qubinode · May 31, 2020 · 0e96c50 · 0e96c50
1 parent 4c8f3f9
commit 0e96c50
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 267 deletions.
diff --git a/templates/grub2.efi.conf.j2 b/templates/grub2.efi.conf.j2
@@ -131,7 +131,7 @@ fi
 ### END /etc/grub.d/01_users ###
 
 ### BEGIN /etc/grub.d/10_linux ###
-menuentry '[QUBINODE] RHEL {{ iso_file }}  {{ ks_file }} Kickstart' --class rhel fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-3.10.0-957.el7.x86_64-advanced-a6984e62-9f65-4c00-884f-18a3884867cb' {
+menuentry '[QUBINODE] {{ iso_file }}  {{ ks_file }} Kickstart' --class rhel fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-3.10.0-957.el7.x86_64-advanced-a6984e62-9f65-4c00-884f-18a3884867cb' {
        set ISO=/boot/iso/{{ iso_file }}
        set KS=/boot/{{ ks_file }}
        set FSUUID={{ dev_fsuuid.stdout }}
@@ -147,18 +147,8 @@ menuentry '[QUBINODE] RHEL {{ iso_file }}  {{ ks_file }} Kickstart' --class rhel
        initrdefi (loop)/isolinux/initrd.img
 }
 
-<<<<<<< HEAD
-menuentry '[ISO] rhel-server-{{rhel_os_major_version}}.{{rhel_os_minor_version}}-x86_64-dvd' --class rhel fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-3.10.0-957.el7.x86_64-advanced-a6984e62-9f65-4c00-884f-18a3884867cb' {
-       set ISO={{ iso_7_grub_dir }}
-=======
-<<<<<<< HEAD
-menuentry '[ISO] rhel-server-{{rhel_os_major_version}}.{{rhel_os_minor_version}}-x86_64-dvd' --class rhel fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-3.10.0-957.el7.x86_64-advanced-a6984e62-9f65-4c00-884f-18a3884867cb' {
-       set ISO={{ iso_7_grub_dir }}
-=======
 menuentry '[ISO] {{ iso_file }} --class rhel fedora --class gnu-linux' --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-3.10.0-957.el7.x86_64-advanced-a6984e62-9f65-4c00-884f-18a3884867cb' {
        set ISO=/boot/iso/{{ iso_file }}
->>>>>>> b72e784c2ff25d113a82ff5765e7a0ee02946ee5
->>>>>>> b920df68f8523a85984f1c3db7042678bb5b9b21
        set FSUUID={{ dev_fsuuid.stdout }}
        search --fs-uuid --set=root $FSUUID
        loopback loop $ISO
@@ -171,36 +161,6 @@ menuentry '[ISO] {{ iso_file }} --class rhel fedora --class gnu-linux' --class g
        linuxefi (loop)/isolinux/vmlinuz inst.stage2=hd:UUID=$FSUUID:$ISO inst.repo=hd:UUID=$FSUUID:$ISO rhgb quiet
        initrdefi (loop)/isolinux/initrd.img
 }
-{% elif rhel_os_major_version == '8' %}
-menuentry '[QUBINODE] RHEL rhel-server-{{rhel_os_major_version}}.{{rhel_os_minor_version}} Kickstart' --class rhel fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-3.10.0-957.el7.x86_64-advanced-a6984e62-9f65-4c00-884f-18a3884867cb' {
-       set ISO={{ iso_8_grub_dir }}
-       set KS={{ ks_file }}
-       set FSUUID={{ dev_fsuuid.stdout }}
-       search --fs-uuid --set=root $FSUUID
-       loopback loop $ISO
-       load_video
-       set gfxpayload=keep
-       insmod gzio
-       insmod part_msdos
-       insmod xfs
-       linuxefi (loop)/isolinux/vmlinuz inst.stage2=hd:UUID=$FSUUID:$ISO inst.repo=hd:UUID=$FSUUID:$ISO inst.ks=hd:UUID=$FSUUID:$KS rhgb quiet
-       initrdefi (loop)/isolinux/initrd.img
-}
-
-menuentry '[ISO] rhel-server-{{rhel_os_major_version}}.{{rhel_os_minor_version}}-x86_64-dvd' --class rhel fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-3.10.0-957.el7.x86_64-advanced-a6984e62-9f65-4c00-884f-18a3884867cb' {
-       set ISO={{ iso_8_grub_dir }}
-       set FSUUID={{ dev_fsuuid.stdout }}
-       search --fs-uuid --set=root $FSUUID
-       loopback loop $ISO
-       load_video
-       set gfxpayload=keep
-       insmod gzio
-       insmod part_gpt
-       insmod xfs
-       linuxefi (loop)/isolinux/vmlinuz inst.stage2=hd:UUID=$FSUUID:$ISO inst.repo=hd:UUID=$FSUUID:$ISO rhgb quiet
-       initrdefi (loop)/isolinux/initrd.img
-
-}
 {% endif %}
 
 menuentry "Boot from next device"  {

diff --git a/templates/grub2.legacy.conf.j2 b/templates/grub2.legacy.conf.j2