simplify life by changing file names
parent
fd1ab46d49
commit
0ebb6d4424
|
@ -22,8 +22,8 @@ support/scripts/genimage.sh -c "$GENIMAGE_CFG"
|
||||||
|
|
||||||
cd "$BINARIES_DIR"
|
cd "$BINARIES_DIR"
|
||||||
mkdir -p root/boot
|
mkdir -p root/boot
|
||||||
cp bzImage root/boot/vmlinuz
|
cp bzImage root/boot/bzImage
|
||||||
cp rootfs.cpio.gz root/boot/initrd.img
|
cp rootfs.cpio.gz root/boot/initrd
|
||||||
mkdir -p root/EFI/BOOT
|
mkdir -p root/EFI/BOOT
|
||||||
cp efi-part/EFI/BOOT/* root/EFI/BOOT/
|
cp efi-part/EFI/BOOT/* root/EFI/BOOT/
|
||||||
cp efiboot.img root/EFI/BOOT/
|
cp efiboot.img root/EFI/BOOT/
|
||||||
|
|
|
@ -2,6 +2,6 @@ set default="0"
|
||||||
set timeout="5"
|
set timeout="5"
|
||||||
|
|
||||||
menuentry "Buildroot" {
|
menuentry "Buildroot" {
|
||||||
linux /boot/vmlinuz console=tty0 rw # kernel
|
linux /boot/bzimage console=tty0 rw # kernel
|
||||||
initrd /boot/initrd.img # rootfs
|
initrd /boot/initrd # rootfs
|
||||||
}
|
}
|
||||||
|
|
|
@ -98,7 +98,7 @@ func enableAddonGCPAuth(cfg *config.ClusterConfig) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
if creds.JSON == nil {
|
if creds.JSON == nil {
|
||||||
out.WarningT("You have authenticated with a service account that does not have an associated JSON. The GCP Auth requires credentials with a JSON file to in order to continue. The image pull secret has been imported.")
|
out.WarningT("You have authenticated with a service account that does not have an associated JSON. The GCP Auth addon requires credentials with a JSON file to in order to continue. The image pull secret has been imported.")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -424,8 +424,8 @@ func (d *Driver) extractKernel(isoPath string) error {
|
||||||
pathInIso string
|
pathInIso string
|
||||||
destPath string
|
destPath string
|
||||||
}{
|
}{
|
||||||
{"/boot/vmlinuz", "vmlinuz"},
|
{"/boot/bzimage", "bzimage"},
|
||||||
{"/boot/initrd.img", "initrd.img"},
|
{"/boot/initrd", "initrd"},
|
||||||
} {
|
} {
|
||||||
fullDestPath := d.ResolveStorePath(f.destPath)
|
fullDestPath := d.ResolveStorePath(f.destPath)
|
||||||
if err := ExtractFile(isoPath, f.pathInIso, fullDestPath); err != nil {
|
if err := ExtractFile(isoPath, f.pathInIso, fullDestPath); err != nil {
|
||||||
|
|
Loading…
Reference in New Issue