diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-09-02 13:58:01 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-03 12:43:24 +0100 |
| commit | 77561e719181d58289687373eebadce764f838a7 (patch) | |
| tree | 2d2536db0169ab35368be16767be67c9a0cef1cf /scripts | |
| parent | 2e7e720cff745f9338217bfc9076451e34941268 (diff) | |
| download | poky-77561e719181d58289687373eebadce764f838a7.tar.gz | |
wic: use ext4 in canned .wks files
Latest kernel doesn't have ext3 compiled in. Wic images produced
from canned .wks can't boot because of that. Switching to ext4
fixes this issue.
(From OE-Core rev: d281a65a81f369fc8d75023b8f911ce4106969c1)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/image/canned-wks/directdisk-gpt.wks | 4 | ||||
| -rw-r--r-- | scripts/lib/image/canned-wks/directdisk-multi-rootfs.wks | 6 | ||||
| -rw-r--r-- | scripts/lib/image/canned-wks/directdisk.wks | 4 | ||||
| -rw-r--r-- | scripts/lib/image/canned-wks/mkefidisk.wks | 4 | ||||
| -rw-r--r-- | scripts/lib/image/canned-wks/mkgummidisk.wks | 4 | ||||
| -rw-r--r-- | scripts/lib/image/canned-wks/mkhybridiso.wks | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/scripts/lib/image/canned-wks/directdisk-gpt.wks b/scripts/lib/image/canned-wks/directdisk-gpt.wks index 235525955c..ea01cf3752 100644 --- a/scripts/lib/image/canned-wks/directdisk-gpt.wks +++ b/scripts/lib/image/canned-wks/directdisk-gpt.wks | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 | 6 | part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 |
| 7 | part / --source rootfs --ondisk sda --fstype=ext3 --label platform --align 1024 --use-uuid | 7 | part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid |
| 8 | 8 | ||
| 9 | bootloader --ptable gpt --timeout=0 --append="rootwait rootfstype=ext3 video=vesafb vga=0x318 console=tty0" | 9 | bootloader --ptable gpt --timeout=0 --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0" |
| 10 | 10 | ||
diff --git a/scripts/lib/image/canned-wks/directdisk-multi-rootfs.wks b/scripts/lib/image/canned-wks/directdisk-multi-rootfs.wks index f3c6df543f..8a81f8f519 100644 --- a/scripts/lib/image/canned-wks/directdisk-multi-rootfs.wks +++ b/scripts/lib/image/canned-wks/directdisk-multi-rootfs.wks | |||
| @@ -16,8 +16,8 @@ | |||
| 16 | # - or any combinations of -r and --rootfs command line options | 16 | # - or any combinations of -r and --rootfs command line options |
| 17 | 17 | ||
| 18 | part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 | 18 | part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 |
| 19 | part / --source rootfs --rootfs-dir=rootfs1 --ondisk sda --fstype=ext3 --label platform --align 1024 | 19 | part / --source rootfs --rootfs-dir=rootfs1 --ondisk sda --fstype=ext4 --label platform --align 1024 |
| 20 | part /rescue --source rootfs --rootfs-dir=rootfs2 --ondisk sda --fstype=ext3 --label secondary --align 1024 | 20 | part /rescue --source rootfs --rootfs-dir=rootfs2 --ondisk sda --fstype=ext4 --label secondary --align 1024 |
| 21 | 21 | ||
| 22 | bootloader --timeout=0 --append="rootwait rootfstype=ext3 video=vesafb vga=0x318 console=tty0" | 22 | bootloader --timeout=0 --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0" |
| 23 | 23 | ||
diff --git a/scripts/lib/image/canned-wks/directdisk.wks b/scripts/lib/image/canned-wks/directdisk.wks index 62dcab15ce..af4c9eadaf 100644 --- a/scripts/lib/image/canned-wks/directdisk.wks +++ b/scripts/lib/image/canned-wks/directdisk.wks | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 | 6 | part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 |
| 7 | part / --source rootfs --ondisk sda --fstype=ext3 --label platform --align 1024 | 7 | part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 |
| 8 | 8 | ||
| 9 | bootloader --timeout=0 --append="rootwait rootfstype=ext3 video=vesafb vga=0x318 console=tty0" | 9 | bootloader --timeout=0 --append="rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0" |
| 10 | 10 | ||
diff --git a/scripts/lib/image/canned-wks/mkefidisk.wks b/scripts/lib/image/canned-wks/mkefidisk.wks index 58d42e61eb..696e94e3d7 100644 --- a/scripts/lib/image/canned-wks/mkefidisk.wks +++ b/scripts/lib/image/canned-wks/mkefidisk.wks | |||
| @@ -4,8 +4,8 @@ | |||
| 4 | 4 | ||
| 5 | part /boot --source bootimg-efi --sourceparams="loader=grub-efi" --ondisk sda --label msdos --active --align 1024 | 5 | part /boot --source bootimg-efi --sourceparams="loader=grub-efi" --ondisk sda --label msdos --active --align 1024 |
| 6 | 6 | ||
| 7 | part / --source rootfs --ondisk sda --fstype=ext3 --label platform --align 1024 | 7 | part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 |
| 8 | 8 | ||
| 9 | part swap --ondisk sda --size 44 --label swap1 --fstype=swap | 9 | part swap --ondisk sda --size 44 --label swap1 --fstype=swap |
| 10 | 10 | ||
| 11 | bootloader --timeout=10 --append="rootwait rootfstype=ext3 console=ttyPCH0,115200 console=tty0 vmalloc=256MB snd-hda-intel.enable_msi=0" | 11 | bootloader --timeout=10 --append="rootwait rootfstype=ext4 console=ttyPCH0,115200 console=tty0 vmalloc=256MB snd-hda-intel.enable_msi=0" |
diff --git a/scripts/lib/image/canned-wks/mkgummidisk.wks b/scripts/lib/image/canned-wks/mkgummidisk.wks index f81cbdfb84..66a22f60bd 100644 --- a/scripts/lib/image/canned-wks/mkgummidisk.wks +++ b/scripts/lib/image/canned-wks/mkgummidisk.wks | |||
| @@ -4,8 +4,8 @@ | |||
| 4 | 4 | ||
| 5 | part /boot --source bootimg-efi --sourceparams="loader=gummiboot" --ondisk sda --label msdos --active --align 1024 | 5 | part /boot --source bootimg-efi --sourceparams="loader=gummiboot" --ondisk sda --label msdos --active --align 1024 |
| 6 | 6 | ||
| 7 | part / --source rootfs --ondisk sda --fstype=ext3 --label platform --align 1024 | 7 | part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 |
| 8 | 8 | ||
| 9 | part swap --ondisk sda --size 44 --label swap1 --fstype=swap | 9 | part swap --ondisk sda --size 44 --label swap1 --fstype=swap |
| 10 | 10 | ||
| 11 | bootloader --timeout=10 --append="rootwait rootfstype=ext3 console=ttyPCH0,115200 console=tty0 vmalloc=256MB snd-hda-intel.enable_msi=0" | 11 | bootloader --timeout=10 --append="rootwait rootfstype=ext4 console=ttyPCH0,115200 console=tty0 vmalloc=256MB snd-hda-intel.enable_msi=0" |
diff --git a/scripts/lib/image/canned-wks/mkhybridiso.wks b/scripts/lib/image/canned-wks/mkhybridiso.wks index b443c15e07..9d34e9b477 100644 --- a/scripts/lib/image/canned-wks/mkhybridiso.wks +++ b/scripts/lib/image/canned-wks/mkhybridiso.wks | |||
| @@ -2,6 +2,6 @@ | |||
| 2 | # long-description: Creates an EFI and legacy bootable hybrid ISO image | 2 | # long-description: Creates an EFI and legacy bootable hybrid ISO image |
| 3 | # which can be used on optical media as well as USB media. | 3 | # which can be used on optical media as well as USB media. |
| 4 | 4 | ||
| 5 | part /boot --source isoimage-isohybrid --sourceparams="loader=grub-efi,image_name=HYBRID_ISO_IMG" --ondisk cd --label HYBRIDISO --fstype=ext3 | 5 | part /boot --source isoimage-isohybrid --sourceparams="loader=grub-efi,image_name=HYBRID_ISO_IMG" --ondisk cd --label HYBRIDISO --fstype=ext4 |
| 6 | 6 | ||
| 7 | bootloader --timeout=15 --append="" | 7 | bootloader --timeout=15 --append="" |