Update deprecated and removed kernel options

Fixes: https://github.com/orgs/ManageIQ/discussions/23119
ManageIQ · Aug 15, 2024 · c6773bd · c6773bd
1 parent 69ac930
commit c6773bd
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 51 deletions.
diff --git a/app/models/customization_template_kickstart.rb b/app/models/customization_template_kickstart.rb
@@ -17,7 +17,7 @@ def self.kernel_args(pxe_server, pxe_image, mac_address)
         File.join(pxe_server.access_url, pxe_server_filepath(pxe_server, pxe_image, mac_address))
       end
 
-    {:ks => ks_access_path, :ksdevice => mac_address}
+    {:"inst.ks" => ks_access_path, :BOOTIF => mac_address}
   end
 
   def default_filename

diff --git a/app/models/pxe_image.rb b/app/models/pxe_image.rb
@@ -44,12 +44,12 @@ def self.pxe_server_filepath(pxe_server, mac_address)
   def create_files_on_server(pxe_server, mac_address, customization_template = nil)
     filepath = self.class.pxe_server_filepath(pxe_server, mac_address)
 
-    # If the customization_template is nil, we set :ks and :ksdevice set to
+    # If the customization_template is nil, we set :"inst.ks" and :BOOTIF set to
     # nil for backwards compatibility. This will remove any ks and ksdevice
     # arguments from final kernel command line.
     kernel_args = customization_template&.class&.kernel_args(
       pxe_server, self, mac_address
-    ) || {:ks => nil, :ksdevice => nil}
+    ) || {:"inst.ks" => nil, :BOOTIF => nil}
     contents = build_pxe_contents(kernel_args)
 
     pxe_server.write_file(filepath, contents)

diff --git a/spec/models/pxe_data/ipxe/mac/00-50-56-91-79-d5 b/spec/models/pxe_data/ipxe/mac/00-50-56-91-79-d5
@@ -1,4 +1,4 @@
 #!ipxe
-kernel http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz ramdisk_size=10000 ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-host.ks.cfg ksdevice=00:50:56:91:79:d5
+kernel http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz ramdisk_size=10000 inst.ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-host.ks.cfg BOOTIF=00:50:56:91:79:d5
 initrd http://192.168.252.60/ipxe/rhel6.2-desktop/initrd.img
 boot
diff --git a/spec/models/pxe_data/pxelinux.cfg/default b/spec/models/pxe_data/pxelinux.cfg/default
@@ -14,7 +14,7 @@ label VMware ESXi 4.1-260247
    menu label VMware ESXi 4.1-260247
    menu default
    kernel VMware-VMvisor-Installer-4.1.0-260247/mboot.c32
-   append VMware-VMvisor-Installer-4.1.0-260247/vmkboot.gz ks=http://192.168.252.60/ks.cfg --- VMware-VMvisor-Installer-4.1.0-260247/vmkernel.gz --- VMware-VMvisor-Installer-4.1.0-260247/sys.vgz --- VMware-VMvisor-Installer-4.1.0-260247/cim.vgz --- VMware-VMvisor-Installer-4.1.0-260247/ienviron.vgz --- VMware-VMvisor-Installer-4.1.0-260247/install.vgz
+   append VMware-VMvisor-Installer-4.1.0-260247/vmkboot.gz inst.ks=http://192.168.252.60/ks.cfg --- VMware-VMvisor-Installer-4.1.0-260247/vmkernel.gz --- VMware-VMvisor-Installer-4.1.0-260247/sys.vgz --- VMware-VMvisor-Installer-4.1.0-260247/cim.vgz --- VMware-VMvisor-Installer-4.1.0-260247/ienviron.vgz --- VMware-VMvisor-Installer-4.1.0-260247/install.vgz
 
 label Ubuntu-10.10-Desktop-i386-LIVE_BOOT
    menu label Ubuntu-10.10-Desktop-i386-LIVE_BOOT

diff --git a/spec/models/pxe_image_ipxe_spec.rb b/spec/models/pxe_image_ipxe_spec.rb
@@ -5,29 +5,29 @@
     it "updates ks and ks_device options" do
       expected_output = <<~PXE_SCRIPT
         #!ipxe
-        kernel ubuntu-10.10-desktop-i386/vmlinuz vga=788 -- quiet ks=http://1.1.1.1/ ksdevice=00:00:00:00:00:00
+        kernel ubuntu-10.10-desktop-i386/vmlinuz vga=788 -- quiet inst.ks=http://1.1.1.1/ BOOTIF=00:00:00:00:00:00
         boot
       PXE_SCRIPT
 
-      image.kernel_options += " ks=abc ksdevice="
+      image.kernel_options += " inst.ks=abc BOOTIF="
 
-      expect(image.build_pxe_contents(:ks       => "http://1.1.1.1/",
-                                      :ksdevice => "00:00:00:00:00:00"))
+      expect(image.build_pxe_contents(:"inst.ks" => "http://1.1.1.1/",
+                                      :BOOTIF    => "00:00:00:00:00:00"))
         .to eq(expected_output)
     end
 
     it "inserts initrd option if present" do
       expected_output = <<~PXE_SCRIPT
         #!ipxe
-        kernel ubuntu-10.10-desktop-i386/vmlinuz vga=788 -- quiet ks=http://1.2.3.4/ ksdevice=12:34:56:78:90:ab
+        kernel ubuntu-10.10-desktop-i386/vmlinuz vga=788 -- quiet inst.ks=http://1.2.3.4/ BOOTIF=12:34:56:78:90:ab
         initrd /path/to/init.rd
         boot
       PXE_SCRIPT
 
       image.initrd = "/path/to/init.rd"
 
-      expect(image.build_pxe_contents(:ks       => "http://1.2.3.4/",
-                                      :ksdevice => "12:34:56:78:90:ab"))
+      expect(image.build_pxe_contents(:"inst.ks" => "http://1.2.3.4/",
+                                      :BOOTIF    => "12:34:56:78:90:ab"))
         .to eq(expected_output)
     end
   end

diff --git a/spec/models/pxe_image_pxelinux_spec.rb b/spec/models/pxe_image_pxelinux_spec.rb
@@ -10,14 +10,14 @@
         label #{image.name}
            menu label #{image.description}
            kernel ubuntu-10.10-desktop-i386/vmlinuz
-           append vga=788 -- quiet ks=http://1.1.1.1/ ksdevice=00:00:00:00:00:00
+           append vga=788 -- quiet inst.ks=http://1.1.1.1/ BOOTIF=00:00:00:00:00:00
 
       PXE_MENU
 
-      image.kernel_options += " ks=abc ksdevice="
+      image.kernel_options += " inst.ks=abc BOOTIF="
 
-      expect(image.build_pxe_contents(:ks       => "http://1.1.1.1/",
-                                      :ksdevice => "00:00:00:00:00:00"))
+      expect(image.build_pxe_contents(:"inst.ks" => "http://1.1.1.1/",
+                                      :BOOTIF    => "00:00:00:00:00:00"))
         .to eq(expected_output)
     end
   end

diff --git a/spec/models/pxe_image_spec.rb b/spec/models/pxe_image_spec.rb
@@ -3,40 +3,40 @@
 
   context "#build_pxe_contents" do
     it "updates ks and ks_device options" do
-      expected_output = "vga=788 -- quiet ks=http://1.1.1.1/ ksdevice=00:00:00:00:00:00"
+      expected_output = "vga=788 -- quiet inst.ks=http://1.1.1.1/ BOOTIF=00:00:00:00:00:00"
 
-      image.kernel_options += " ks=abc ksdevice="
+      image.kernel_options += " inst.ks=abc BOOTIF="
 
-      expect(image.build_pxe_contents(:ks       => "http://1.1.1.1/",
-                                      :ksdevice => "00:00:00:00:00:00"))
+      expect(image.build_pxe_contents(:"inst.ks" => "http://1.1.1.1/",
+                                      :BOOTIF    => "00:00:00:00:00:00"))
         .to eq(expected_output)
     end
 
     it "appends ksdevice if missing" do
-      expected_output = "vga=788 -- quiet ks=http://1.1.1.1/ ksdevice=00:00:00:00:00:00"
+      expected_output = "vga=788 -- quiet inst.ks=http://1.1.1.1/ BOOTIF=00:00:00:00:00:00"
 
-      image.kernel_options += " ks=abc"
+      image.kernel_options += " inst.ks=abc"
 
-      expect(image.build_pxe_contents(:ks       => "http://1.1.1.1/",
-                                      :ksdevice => "00:00:00:00:00:00"))
+      expect(image.build_pxe_contents(:"inst.ks" => "http://1.1.1.1/",
+                                      :BOOTIF    => "00:00:00:00:00:00"))
         .to eq(expected_output)
     end
 
     it "appends ks if missing" do
-      expected_output = "vga=788 -- quiet ksdevice=00:00:00:00:00:00 ks=http://1.1.1.1/"
+      expected_output = "vga=788 -- quiet BOOTIF=00:00:00:00:00:00 inst.ks=http://1.1.1.1/"
 
-      image.kernel_options += " ksdevice=abc"
+      image.kernel_options += " BOOTIF=abc"
 
-      expect(image.build_pxe_contents(:ks       => "http://1.1.1.1/",
-                                      :ksdevice => "00:00:00:00:00:00"))
+      expect(image.build_pxe_contents(:"inst.ks" => "http://1.1.1.1/",
+                                      :BOOTIF    => "00:00:00:00:00:00"))
         .to eq(expected_output)
     end
 
     it "removes ks and ksdevice if blank" do
       expected_output = "vga=788 -- quiet"
 
-      expect(image.build_pxe_contents(:ks       => nil,
-                                      :ksdevice => nil))
+      expect(image.build_pxe_contents(:"inst.ks" => nil,
+                                      :BOOTIF    => nil))
         .to eq(expected_output)
     end
   end

diff --git a/spec/models/pxe_menu_ipxe_spec.rb b/spec/models/pxe_menu_ipxe_spec.rb
@@ -43,13 +43,13 @@
 
       ########## MIQ Desktop Images ##########
       :rhel62dsk
-      kernel http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz ramdisk_size=10000 ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-desktop.ks.cfg ksdevice=00:50:56:91:79:d5
+      kernel http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz ramdisk_size=10000 inst.ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-desktop.ks.cfg BOOTIF=00:50:56:91:79:d5
       initrd http://192.168.252.60/ipxe/rhel6.2-desktop/initrd.img
       boot
 
       ########## MIQ Server Images ##########
       :rhel62host
-      kernel http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz ramdisk_size=10000 ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-host.ks.cfg
+      kernel http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz ramdisk_size=10000 inst.ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-host.ks.cfg
       initrd http://192.168.252.60/ipxe/rhel6.2-desktop/initrd.img
       boot
 
@@ -70,7 +70,7 @@
 
       ########## MIQ Server Images ##########
       :rhel62host
-      kernel http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz ramdisk_size=10000 ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-host.ks.cfg
+      kernel http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz ramdisk_size=10000 inst.ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-host.ks.cfg
       initrd http://192.168.252.60/ipxe/rhel6.2-desktop/initrd.img
       boot
     PXEMENU
@@ -82,8 +82,8 @@
   end
 
   it ".parse_kernel" do
-    k = "http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz ramdisk_size=10000 ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-host.ks.cfg ksdevice=00:19:e3:d7:5b:0e"
-    expect(described_class.parse_kernel(k)).to eq(["http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz", "ramdisk_size=10000 ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-host.ks.cfg ksdevice=00:19:e3:d7:5b:0e"])
+    k = "http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz ramdisk_size=10000 inst.ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-host.ks.cfg BOOTIF=00:19:e3:d7:5b:0e"
+    expect(described_class.parse_kernel(k)).to eq(["http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz", "ramdisk_size=10000 inst.ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-host.ks.cfg BOOTIF=00:19:e3:d7:5b:0e"])
   end
 
   context "#synchronize_images" do

diff --git a/spec/models/pxe_menu_pxelinux_spec.rb b/spec/models/pxe_menu_pxelinux_spec.rb
@@ -12,7 +12,7 @@
       label VMware ESXi 4.1-260247
         menu label VMware ESXi 4.1-260247
         kernel VMware-VMvisor-Installer-4.1.0-260247/mboot.c32
-        append VMware-VMvisor-Installer-4.1.0-260247/vmkboot.gz ks=http://192.168.252.60/ks.cfg --- VMware-VMvisor-Installer-4.1.0-260247/vmkernel.gz --- VMware-VMvisor-Installer-4.1.0-260247/sys.vgz --- VMware-VMvisor-Installer-4.1.0-260247/cim.vgz --- VMware-VMvisor-Installer-4.1.0-260247/ienviron.vgz --- VMware-VMvisor-Installer-4.1.0-260247/install.vgz
+        append VMware-VMvisor-Installer-4.1.0-260247/vmkboot.gz inst.ks=http://192.168.252.60/ks.cfg --- VMware-VMvisor-Installer-4.1.0-260247/vmkernel.gz --- VMware-VMvisor-Installer-4.1.0-260247/sys.vgz --- VMware-VMvisor-Installer-4.1.0-260247/cim.vgz --- VMware-VMvisor-Installer-4.1.0-260247/ienviron.vgz --- VMware-VMvisor-Installer-4.1.0-260247/install.vgz
 
       label Ubuntu-10.10-Desktop-i386-LIVE_BOOT
         menu label Ubuntu-10.10-Desktop-i386-LIVE_BOOT
@@ -32,12 +32,12 @@
       label RHEL6
         menu label RHEL6
         kernel rhel6/vmlinuz
-        append initrd=rhel6/initrd.img ramdisk_size=10000 ks=http://192.168.252.60/pxelinux.cfg/01-78-2b-cb-00-f6-6c.ks.cfg ksdevice=78:2b:cb:00:f6:6c
+        append initrd=rhel6/initrd.img ramdisk_size=10000 inst.ks=http://192.168.252.60/pxelinux.cfg/01-78-2b-cb-00-f6-6c.ks.cfg BOOTIF=78:2b:cb:00:f6:6c
 
       label RHEL6.2-Desktop
         menu label RHEL6.2-Desktop
         kernel rhel6.2-desktop/vmlinuz
-        append initrd=rhel6.2-desktop/initrd.img ramdisk_size=10000 ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-desktop.ks.cfg ksdevice=78:2b:cb:00:f6:6c
+        append initrd=rhel6.2-desktop/initrd.img ramdisk_size=10000 inst.ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-desktop.ks.cfg BOOTIF=78:2b:cb:00:f6:6c
 
       label VMware ESXi 5.0.0-381646
         menu label VMware ESXi 5.0.0-381646
@@ -69,7 +69,7 @@
       label RHEL6
         menu label RHEL6
         kernel rhel6/vmlinuz
-        append initrd=rhel6/initrd.img ramdisk_size=10000 ks=http://192.168.252.60/pxelinux.cfg/01-78-2b-cb-00-f6-6c.ks.cfg ksdevice=78:2b:cb:00:f6:6c
+        append initrd=rhel6/initrd.img ramdisk_size=10000 inst.ks=http://192.168.252.60/pxelinux.cfg/01-78-2b-cb-00-f6-6c.ks.cfg BOOTIF=78:2b:cb:00:f6:6c
 
       prompt 0
       timeout 600
@@ -82,8 +82,8 @@
   end
 
   it ".parse_append" do
-    a = "initrd=rhel6/initrd.img ramdisk_size=10000 ks=http://192.168.252.60/pxelinux.cfg/01-78-2b-cb-00-f6-6c.ks.cfg ksdevice=78:2b:cb:00:f6:6c"
-    expect(described_class.parse_append(a)).to eq(["ramdisk_size=10000 ks=http://192.168.252.60/pxelinux.cfg/01-78-2b-cb-00-f6-6c.ks.cfg ksdevice=78:2b:cb:00:f6:6c", "rhel6/initrd.img"])
+    a = "initrd=rhel6/initrd.img ramdisk_size=10000 inst.ks=http://192.168.252.60/pxelinux.cfg/01-78-2b-cb-00-f6-6c.ks.cfg BOOTIF=78:2b:cb:00:f6:6c"
+    expect(described_class.parse_append(a)).to eq(["ramdisk_size=10000 inst.ks=http://192.168.252.60/pxelinux.cfg/01-78-2b-cb-00-f6-6c.ks.cfg BOOTIF=78:2b:cb:00:f6:6c", "rhel6/initrd.img"])
   end
 
   context "#synchronize_images" do

diff --git a/spec/models/pxe_menu_spec.rb b/spec/models/pxe_menu_spec.rb
@@ -12,7 +12,7 @@
       label VMware ESXi 4.1-260247
         menu label VMware ESXi 4.1-260247
         kernel VMware-VMvisor-Installer-4.1.0-260247/mboot.c32
-        append VMware-VMvisor-Installer-4.1.0-260247/vmkboot.gz ks=http://192.168.252.60/ks.cfg --- VMware-VMvisor-Installer-4.1.0-260247/vmkernel.gz --- VMware-VMvisor-Installer-4.1.0-260247/sys.vgz --- VMware-VMvisor-Installer-4.1.0-260247/cim.vgz --- VMware-VMvisor-Installer-4.1.0-260247/ienviron.vgz --- VMware-VMvisor-Installer-4.1.0-260247/install.vgz
+        append VMware-VMvisor-Installer-4.1.0-260247/vmkboot.gz inst.ks=http://192.168.252.60/ks.cfg --- VMware-VMvisor-Installer-4.1.0-260247/vmkernel.gz --- VMware-VMvisor-Installer-4.1.0-260247/sys.vgz --- VMware-VMvisor-Installer-4.1.0-260247/cim.vgz --- VMware-VMvisor-Installer-4.1.0-260247/ienviron.vgz --- VMware-VMvisor-Installer-4.1.0-260247/install.vgz
 
       label Ubuntu-10.10-Desktop-i386-LIVE_BOOT
         menu label Ubuntu-10.10-Desktop-i386-LIVE_BOOT
@@ -32,12 +32,12 @@
       label RHEL6
         menu label RHEL6
         kernel rhel6/vmlinuz
-        append initrd=rhel6/initrd.img ramdisk_size=10000 ks=http://192.168.252.60/pxelinux.cfg/01-78-2b-cb-00-f6-6c.ks.cfg ksdevice=78:2b:cb:00:f6:6c
+        append initrd=rhel6/initrd.img ramdisk_size=10000 inst.ks=http://192.168.252.60/pxelinux.cfg/01-78-2b-cb-00-f6-6c.ks.cfg BOOTIF=78:2b:cb:00:f6:6c
 
       label RHEL6.2-Desktop
         menu label RHEL6.2-Desktop
         kernel rhel6.2-desktop/vmlinuz
-        append initrd=rhel6.2-desktop/initrd.img ramdisk_size=10000 ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-desktop.ks.cfg ksdevice=78:2b:cb:00:f6:6c
+        append initrd=rhel6.2-desktop/initrd.img ramdisk_size=10000 inst.ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-desktop.ks.cfg BOOTIF=78:2b:cb:00:f6:6c
 
       label VMware ESXi 5.0.0-381646
         menu label VMware ESXi 5.0.0-381646
@@ -105,13 +105,13 @@
 
       ########## MIQ Desktop Images ##########
       :rhel62dsk
-      kernel http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz ramdisk_size=10000 ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-desktop.ks.cfg ksdevice=00:50:56:91:79:d5
+      kernel http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz ramdisk_size=10000 inst.ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-desktop.ks.cfg BOOTIF=00:50:56:91:79:d5
       initrd http://192.168.252.60/ipxe/rhel6.2-desktop/initrd.img
       boot
 
       ########## MIQ Server Images ##########
       :rhel62host
-      kernel http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz ramdisk_size=10000 ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-host.ks.cfg
+      kernel http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz ramdisk_size=10000 inst.ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-host.ks.cfg
       initrd http://192.168.252.60/ipxe/rhel6.2-desktop/initrd.img
       boot
 

diff --git a/spec/models/pxe_server_spec.rb b/spec/models/pxe_server_spec.rb
@@ -148,7 +148,7 @@ def file_write(file, contents)
           label Ubuntu-10.10-Desktop-i386-LIVE_BOOT
              menu label Ubuntu-10.10-Desktop-i386-LIVE_BOOT
              kernel ubuntu-10.10-desktop-i386/vmlinuz
-             append initrd=ubuntu-10.10-desktop-i386/initrd.lz vga=normal boot=casper netboot=nfs nfsroot=192.168.252.60:/srv/nfsboot/ubuntu-10.10-desktop-i386 -- quiet ks=#{@pxe_server.access_url}/#{@pxe_server.customization_directory}/#{dashed_mac_address}.ks.cfg ksdevice=00:19:e3:d7:5b:0e
+             append initrd=ubuntu-10.10-desktop-i386/initrd.lz vga=normal boot=casper netboot=nfs nfsroot=192.168.252.60:/srv/nfsboot/ubuntu-10.10-desktop-i386 -- quiet inst.ks=#{@pxe_server.access_url}/#{@pxe_server.customization_directory}/#{dashed_mac_address}.ks.cfg BOOTIF=00:19:e3:d7:5b:0e
 
         PXE
 
@@ -238,7 +238,7 @@ def file_write(file, contents)
     context "#sync_images" do
       before do
         @expected = [
-          ["00-50-56-91-79-d5", "00-50-56-91-79-d5", "http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz", "ramdisk_size=10000 ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-host.ks.cfg ksdevice=00:50:56:91:79:d5"]
+          ["00-50-56-91-79-d5", "00-50-56-91-79-d5", "http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz", "ramdisk_size=10000 inst.ks=http://192.168.252.60/pxelinux.cfg/rhel6.2-host.ks.cfg BOOTIF=00:50:56:91:79:d5"]
         ]
       end
 
@@ -264,7 +264,7 @@ def file_write(file, contents)
         image = FactoryBot.create(:pxe_image_ipxe,
                                    :pxe_server     => @pxe_server,
                                    :kernel         => "http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz",
-                                   :kernel_options => "ramdisk_size=10000 ksdevice=00:50:56:91:79:d5",
+                                   :kernel_options => "ramdisk_size=10000 BOOTIF=00:50:56:91:79:d5",
                                    :initrd         => "http://192.168.252.60/ipxe/rhel6.2-desktop/initrd.img"
                                   )
         expected_name = @pxe_server.test_full_path_to("#{@pxe_server.pxe_directory}/00-19-e3-d7-5b-0e")
@@ -294,7 +294,7 @@ def file_write(file, contents)
         image = FactoryBot.create(:pxe_image_ipxe,
                                    :pxe_server     => @pxe_server,
                                    :kernel         => "http://192.168.252.60/ipxe/rhel6.2-desktop/vmlinuz",
-                                   :kernel_options => "ramdisk_size=10000 ksdevice=00:50:56:91:79:d5",
+                                   :kernel_options => "ramdisk_size=10000 BOOTIF=00:50:56:91:79:d5",
                                    :initrd         => "http://192.168.252.60/ipxe/rhel6.2-desktop/initrd.img"
                                   )
 
@@ -303,7 +303,7 @@ def file_write(file, contents)
 
         expected_contents = <<~PXE
           #!ipxe
-          kernel #{image.kernel} ramdisk_size=10000 ksdevice=00:19:e3:d7:5b:0e ks=#{@pxe_server.access_url}/#{@pxe_server.customization_directory}/#{dashed_mac_address}.ks.cfg
+          kernel #{image.kernel} ramdisk_size=10000 BOOTIF=00:19:e3:d7:5b:0e inst.ks=#{@pxe_server.access_url}/#{@pxe_server.customization_directory}/#{dashed_mac_address}.ks.cfg
           initrd #{image.initrd}
           boot
         PXE