Merge branch 'main' into remove-deprecated-pkg

tinkerbell · Aug 18, 2023 · b690331 · b690331
2 parents 22a2f47 + 53e2f8e
commit b690331
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ipxe/script/auto_test.go b/ipxe/script/auto_test.go
@@ -33,7 +33,7 @@ echo Loading the Tinkerbell Hook iPXE script...
 set arch x86_64
 set download-url http://location:8080/to/kernel/and/initrd
 
-kernel ${download-url}/vmlinuz-${arch} ip=dhcp tink_worker_image=quay.io/tinkerbell/tink-worker:v0.8.0 tinkerbell=packet \
+kernel ${download-url}/vmlinuz-${arch} tink_worker_image=quay.io/tinkerbell/tink-worker:v0.8.0 tinkerbell=packet \
 facility=onprem syslog_host=1.2.3.4 grpc_authority=1.2.3.4:42113 tinkerbell_tls=false worker_id=3c:ec:ef:4c:4f:54 hw_addr=3c:ec:ef:4c:4f:54 \
 modules=loop,squashfs,sd-mod,usb-storage intel_iommu=on iommu=pt initrd=initramfs-${arch} console=tty0 console=ttyS1,115200
 

diff --git a/ipxe/script/hook.go b/ipxe/script/hook.go
@@ -11,7 +11,7 @@ echo Debug TraceID: {{ .TraceID }}
 set arch {{ .Arch }}
 set download-url {{ .DownloadURL }}
 
-kernel ${download-url}/vmlinuz-${arch} {{- if ne .VLANID "" }} vlan_id={{ .VLANID }} {{- else }} ip=dhcp {{- end }} {{- range .ExtraKernelParams}} {{.}} {{- end}} \
+kernel ${download-url}/vmlinuz-${arch} {{- if ne .VLANID "" }} vlan_id={{ .VLANID }} {{- end }} {{- range .ExtraKernelParams}} {{.}} {{- end}} \
 facility={{ .Facility }} syslog_host={{ .SyslogHost }} grpc_authority={{ .TinkGRPCAuthority }} tinkerbell_tls={{ .TinkerbellTLS }} worker_id={{ .WorkerID }} hw_addr={{ .HWAddr }} \
 modules=loop,squashfs,sd-mod,usb-storage intel_iommu=on iommu=pt initrd=initramfs-${arch} console=tty0 console=ttyS1,115200