From 6ee3c481ac3309de801e5c2f10dfedf121e3c1fd Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Mon, 21 Mar 2022 16:03:24 +0100 Subject: [PATCH] fix(pxe): Fix some bugs in Add ALT Signed-off-by: Peter Mikus Change-Id: I2d7dfc34695a964012c0bfb8eb618f888d88e555 --- .../tftpboot/grub/grub.cfg-3c:ec:ef:b9:cc:56 | 2 +- .../tftpboot/grub/grub.cfg-70:e2:84:8f:5d:0b | 2 +- .../tftpboot/grub/grub.cfg-70:e2:84:8f:e3:48 | 2 +- .../ubuntu_focal_amd64/3c:ec:ef:b9:cc:56/user-data | 45 ++-------------------- 4 files changed, 7 insertions(+), 44 deletions(-) diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:cc:56 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:cc:56 index 149f8b2528..1b05ed8ddf 100644 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:cc:56 +++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:b9:cc:56 @@ -1,4 +1,4 @@ menuentry "Install s64-t34-tg1" { - linux /casper/ubuntu-focal-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:cc:56 url=https://releases.ubuntu.com/20.04.3/ubuntu-20.04.3-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_amd64/3c:ec:ef:b9:cc:56/ --- console=ttyS0,115200n8 quiet + linux /casper/ubuntu-focal-amd64/vmlinuz ip=dhcp interface=3c:ec:ef:b9:cc:56 url=https://releases.ubuntu.com/20.04.4/ubuntu-20.04.4-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_amd64/3c:ec:ef:b9:cc:56/ --- console=ttyS0,115200n8 quiet initrd /casper/ubuntu-focal-amd64/initrd } diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-70:e2:84:8f:5d:0b b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-70:e2:84:8f:5d:0b index 011853f072..c810a3cacd 100644 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-70:e2:84:8f:5d:0b +++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-70:e2:84:8f:5d:0b @@ -1,4 +1,4 @@ menuentry "Install s63-t34-sut2" { - linux /casper/ubuntu-focal-arm64/vmlinuz ip=dhcp interface=70:e2:84:8f:5d:0b url=http://10.30.51.28:8081/ubuntu_focal_arm64/ubuntu-20.04.3-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_arm64/70:e2:84:8f:5d:0b/ --- console=ttyAMA0,115200n8 quiet + linux /casper/ubuntu-focal-arm64/vmlinuz ip=dhcp interface=70:e2:84:8f:5d:0b url=http://10.30.51.28:8081/ubuntu_focal_arm64/ubuntu-20.04.4-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_arm64/70:e2:84:8f:5d:0b/ --- console=ttyAMA0,115200n8 quiet initrd /casper/ubuntu-focal-arm64/initrd } \ No newline at end of file diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-70:e2:84:8f:e3:48 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-70:e2:84:8f:e3:48 index 5059635e32..ea6d5e4162 100644 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-70:e2:84:8f:e3:48 +++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-70:e2:84:8f:e3:48 @@ -1,4 +1,4 @@ menuentry "Install s62-t34-sut1" { - linux /casper/ubuntu-focal-arm64/vmlinuz ip=dhcp interface=70:e2:84:8f:e3:48 url=http://10.30.51.28:8081/ubuntu_focal_arm64/ubuntu-20.04.3-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_arm64/70:e2:84:8f:e3:48/ --- console=ttyAMA0,115200n8 quiet + linux /casper/ubuntu-focal-arm64/vmlinuz ip=dhcp interface=70:e2:84:8f:e3:48 url=http://10.30.51.28:8081/ubuntu_focal_arm64/ubuntu-20.04.4-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_arm64/70:e2:84:8f:e3:48/ --- console=ttyAMA0,115200n8 quiet initrd /casper/ubuntu-focal-arm64/initrd } \ No newline at end of file diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/3c:ec:ef:b9:cc:56/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/3c:ec:ef:b9:cc:56/user-data index 6eadb58ec1..650857a96b 100644 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/3c:ec:ef:b9:cc:56/user-data +++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/3c:ec:ef:b9:cc:56/user-data @@ -45,13 +45,6 @@ autoinstall: preserve: false type: disk wipe: superblock-recursive - - grub_device: false - id: disk-sdb - path: /dev/sdb - ptable: gpt - preserve: false - type: disk - wipe: superblock-recursive - device: disk-sda grub_device: true id: partition-0 @@ -61,56 +54,26 @@ autoinstall: size: 536870912 type: partition wipe: superblock - - device: disk-sdb - grub_device: true - id: partition-1 - flag: boot - number: 1 - preserve: false - size: 536870912 - type: partition - wipe: superblock - id: format-0 fstype: fat32 preserve: false type: format volume: partition-0 - - id: format-1 - fstype: fat32 - preserve: false - type: format - volume: partition-1 - device: disk-sda flag: '' grub_device: false - id: partition-2 - number: 2 - preserve: false - size: -1 - type: partition - wipe: superblock - - device: disk-sdb - flag: '' - grub_device: false - id: partition-3 + id: partition-1 number: 2 preserve: false size: -1 type: partition wipe: superblock - - name: md0 - raidlevel: raid1 - devices: [partition-2, partition-3] - spare_devices: [] - preserve: false - type: raid - id: raid-0 - fstype: ext4 - id: format-2 + id: format-1 preserve: false type: format - volume: raid-0 - - device: format-2 + volume: partition-1 + - device: format-1 id: mount-1 path: / type: mount -- 2.16.6