diff options
| author | Edward A. James <eajames@us.ibm.com> | 2017-11-09 16:03:14 -0600 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2017-11-28 13:49:42 +0000 |
| commit | c03b9c4a5d5f8e089297d8d4c13540d6b2c9421f (patch) | |
| tree | 9ac113538f9b8edf3b576540c0415994c37c0aad /meta-phosphor/common/recipes-core | |
| parent | 8053d428ff7f353463c25447de450056d441d5bd (diff) | |
| download | talos-openbmc-c03b9c4a5d5f8e089297d8d4c13540d6b2c9421f.tar.gz talos-openbmc-c03b9c4a5d5f8e089297d8d4c13540d6b2c9421f.zip | |
init: Add init script to setup /etc mount before starting systemd
Systemd requires /etc mounted and ready at init time. Previously, we
were mounting /etc as an overlay from the persistant filesystem after
systemd started. This caused a variety of issues with systemd and
associated applications (journal, etc).
This change also adds factory reset functionality.
Resolves openbmc/openbmc#2542
Change-Id: Ib8a38e99df39f833026fe4475670a7ec2b9c8d4d
Signed-off-by: Edward A. James <eajames@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-core')
| -rw-r--r-- | meta-phosphor/common/recipes-core/base-files/base-files/fstab | 4 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/meta-phosphor/common/recipes-core/base-files/base-files/fstab b/meta-phosphor/common/recipes-core/base-files/base-files/fstab index 7d6ac6c6c..4a0766876 100644 --- a/meta-phosphor/common/recipes-core/base-files/base-files/fstab +++ b/meta-phosphor/common/recipes-core/base-files/base-files/fstab @@ -4,8 +4,6 @@ proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 -ubi0:rwfs /var ubifs defaults,x-systemd.requires=obmc-flash-bmc-reset.service 0 0 -overlay /etc overlay defaults,x-systemd.requires=prepare-overlay.service,lowerdir=/etc,upperdir=/var/persist/etc,workdir=/var/persist/etc-work 0 0 tmpfs /var/volatile tmpfs defaults 0 0 tmpfs /media tmpfs defaults 0 0 -/var/persist/home /home none bind,x-systemd.requires=prepare-overlay.service 0 0 +/var/persist/home /home none bind 0 0 diff --git a/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend b/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend index f282cde90..e632d563c 100644 --- a/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend +++ b/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend @@ -2,7 +2,7 @@ inherit obmc-phosphor-utils FILESEXTRAPATHS_prepend := "${@mf_enabled(d, 'obmc-ubi-fs', '${THISDIR}/${PN}:')}" -RDEPENDS_${PN}_append += "${@mf_enabled(d, 'obmc-ubi-fs', 'mount-overlay-help')}" +RDEPENDS_${PN}_append += "${@mf_enabled(d, 'obmc-ubi-fs', 'preinit-mounts')}" do_install_append() { install -d ${D}/srv |
