[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5850/8267] rootfs-postcommands.bbclass: Check if "/etc/fstab" exists
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 5850/8267] rootfs-postcommands.bbclass: Check if "/etc/fstab" exists
- Date: Sun, 17 Dec 2017 04:01:05 +0000 (UTC)
commit 6830a969f27814b76c2cbab56b8957c532b76487
Author: Panagiotis Tamtamis <panagiotis tamtamis unify com>
Date: Fri Apr 28 10:09:27 2017 +0300
rootfs-postcommands.bbclass: Check if "/etc/fstab" exists
Using "read-only-rootfs" feature in minimal or special
purpose images (eg mounted images) makes build to fail
because ${IMAGE_ROOTFS}/etc/fstab file does not exist.
(From OE-Core rev: 43714514fb29a40830e6619552980d7f88d77fb7)
Signed-off-by: Panagiotis Tamtamis <panagiotis tamtamis unify com>
Signed-off-by: Ross Burton <ross burton intel com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
meta/classes/rootfs-postcommands.bbclass | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index 498174a..1d66a42 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -84,7 +84,9 @@ systemd_create_users () {
#
read_only_rootfs_hook () {
# Tweak the mount option and fs_passno for rootfs in fstab
- sed -i -e
'/^[#[:space:]]*\/dev\/root/{s/defaults/ro/;s/\([[:space:]]*[[:digit:]]\)\([[:space:]]*\)[[:digit:]]$/\1\20/}'
${IMAGE_ROOTFS}/etc/fstab
+ if [ -f ${IMAGE_ROOTFS}/etc/fstab ]; then
+ sed -i -e
'/^[#[:space:]]*\/dev\/root/{s/defaults/ro/;s/\([[:space:]]*[[:digit:]]\)\([[:space:]]*\)[[:digit:]]$/\1\20/}'
${IMAGE_ROOTFS}/etc/fstab
+ fi
# If we're using openssh and the /etc/ssh directory has no pre-generated keys,
# we should configure openssh to use the configuration file /etc/ssh/sshd_config_readonly
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]