From 22bd7aa878adfc8f7b6c12bc92e441fa3b161e2c Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 13 Oct 2017 08:56:06 +0800 Subject: base-files: only apply the bbappend if ima distro flag set When the meta-integrity layer is included but feature ima is not set, we would get the following error when the system startup: qemux86-64 systemd-remount-fs[81]: mount: /sys/kernel/security: mount point does not exist. qemux86-64 systemd-remount-fs[81]: /bin/mount for /sys/kernel/security exited with exit status 32. Rename base-files_%.bbappend to base-files-integrity.inc and add a new bbappend. Make sure this piece of code should be applied only if the ima feature is set. Signed-off-by: Yi Zhao --- meta-integrity/recipes-core/base-files/base-files-integrity.inc | 5 +++++ meta-integrity/recipes-core/base-files/base-files_%.bbappend | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 meta-integrity/recipes-core/base-files/base-files-integrity.inc diff --git a/meta-integrity/recipes-core/base-files/base-files-integrity.inc b/meta-integrity/recipes-core/base-files/base-files-integrity.inc new file mode 100644 index 0000000..7e9e210 --- /dev/null +++ b/meta-integrity/recipes-core/base-files/base-files-integrity.inc @@ -0,0 +1,5 @@ +# Append iversion option for auto types +do_install_append() { + sed -i 's/\s*auto\s*defaults/&,iversion/' "${D}${sysconfdir}/fstab" + echo 'securityfs /sys/kernel/security securityfs defaults 0 0' >> "${D}${sysconfdir}/fstab" +} diff --git a/meta-integrity/recipes-core/base-files/base-files_%.bbappend b/meta-integrity/recipes-core/base-files/base-files_%.bbappend index 7e9e210..49417fe 100644 --- a/meta-integrity/recipes-core/base-files/base-files_%.bbappend +++ b/meta-integrity/recipes-core/base-files/base-files_%.bbappend @@ -1,5 +1 @@ -# Append iversion option for auto types -do_install_append() { - sed -i 's/\s*auto\s*defaults/&,iversion/' "${D}${sysconfdir}/fstab" - echo 'securityfs /sys/kernel/security securityfs defaults 0 0' >> "${D}${sysconfdir}/fstab" -} +require ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'base-files-integrity.inc', '', d)} -- cgit v1.2.3-54-g00ecf