aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2018-05-22 13:34:19 +0300
committerRiku Voipio <riku.voipio@linaro.org>2018-05-22 13:34:19 +0300
commit7920c78446c71ea9e3f768722071dc3001e69d4d (patch)
tree8a214ddba5e881dd1934937a2efe15d51085db72
parentd200e486d84bd6457dfcde1388e59f28b5b71bb4 (diff)
downloadfai-7920c78446c71ea9e3f768722071dc3001e69d4d.tar.gz
Make bootloader partition nofail
Ignore failure to mount /boot/efi or /boot/uboot. See systemd.mount(1) for details. Change-Id: I8bdad6a1aa35c756eb193f340ba682983ec14856
-rw-r--r--disk_config/B22602
-rw-r--r--disk_config/HIKEY2
-rwxr-xr-xscripts/HIKEY/10-setup2
3 files changed, 3 insertions, 3 deletions
diff --git a/disk_config/B2260 b/disk_config/B2260
index 9ceaf63..b834410 100644
--- a/disk_config/B2260
+++ b/disk_config/B2260
@@ -1,4 +1,4 @@
disk_config disk1 disklabel:gpt fstabkey:uuid bootable:2
-primary /boot/uboot 64 vfat rw createopts="-n BOOT"
+primary /boot/uboot 64 vfat rw,nofail createopts="-n BOOT"
primary / 1G- ext4 rw createopts="-L rootfs-sd"
diff --git a/disk_config/HIKEY b/disk_config/HIKEY
index 61f53c3..7264c54 100644
--- a/disk_config/HIKEY
+++ b/disk_config/HIKEY
@@ -1,4 +1,4 @@
disk_config disk1 disklabel:msdos fstabkey:uuid bootable:1
-primary /boot/efi 64 vfat rw createopts="-n BOOT -S 4096"
+primary /boot/efi 64 vfat rw,nofail createopts="-n BOOT -S 4096"
primary / 1G- ext4 rw createopts="-L rootfs-sd"
diff --git a/scripts/HIKEY/10-setup b/scripts/HIKEY/10-setup
index 511de82..ef3fee2 100755
--- a/scripts/HIKEY/10-setup
+++ b/scripts/HIKEY/10-setup
@@ -1,7 +1,7 @@
#!/bin/sh
# replace UUID with label for /boot/efi
-sed -i -e 's,^UUID.*/boot/efi.*$,LABEL=BOOT /boot/efi vfat rw 0 2,' $target/etc/fstab
+sed -i -e 's,^UUID.*/boot/efi.*$,LABEL=BOOT /boot/efi vfat rw,nofail 0 2,' $target/etc/fstab
echo hi655x_pmic >> $target/etc/initramfs-tools/modules
$ROOTCMD update-initramfs -u -k all