summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter A. Bigot <pab@pabigot.com>2018-03-07 11:17:57 -0600
committerAndrei Gherzan <andrei@gherzan.com>2018-04-03 14:46:10 +0100
commit20358ec57a8744b0a02da77b283620fb718b0ee0 (patch)
tree970a6c4cfaa8c2d185d36e7f6d3fa4e11686250b
parentb58ccfc696e4fa6b680ae5ca79960312676d7af9 (diff)
downloadmeta-raspberrypi-20358ec57a8744b0a02da77b283620fb718b0ee0.tar.gz
sdimage-raspberrypi.wks: find /boot partition on mmcblk0
Recently wic was modified to no longer exclude /boot from partitions added to fstab. The --on parameter in many kickstart specifications insufficiently resolved the MMC device, resulting in attempts to mount /dev/mmcblkp1 as boot when the device should be /dev/mmcblk0p1. With systemd the mount failure is an error and the system drops into emergency mode. Signed-off-by: Peter A. Bigot <pab@pabigot.com> (cherry picked from commit 0e1e2c6e0aebab8a7536f81dc25f50c0f2f6d518) Signed-off-by: Phong Tran <tranmanphong@gmail.com>
-rw-r--r--wic/sdimage-raspberrypi.wks4
1 files changed, 2 insertions, 2 deletions
diff --git a/wic/sdimage-raspberrypi.wks b/wic/sdimage-raspberrypi.wks
index 353daac..01fbaea 100644
--- a/wic/sdimage-raspberrypi.wks
+++ b/wic/sdimage-raspberrypi.wks
@@ -2,5 +2,5 @@
2# long-description: Creates a partitioned SD card image for use with 2# long-description: Creates a partitioned SD card image for use with
3# Raspberry Pi. Boot files are located in the first vfat partition. 3# Raspberry Pi. Boot files are located in the first vfat partition.
4 4
5part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 20 5part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --size 20
6part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096 6part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 4096