summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/common/recipes-core
diff options
context:
space:
mode:
authorMichael Tritz <mtritz@us.ibm.com>2017-09-21 00:41:15 -0500
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2017-10-05 17:21:01 +0000
commita7cf6bcd34c704c3831c24579be9a1aaa954cede (patch)
treeef93bc719406e180446a2be664006b06f76f79e8 /meta-phosphor/common/recipes-core
parent59e82a7f4e90080df7cca10282710c23bc1e619c (diff)
downloadtalos-openbmc-a7cf6bcd34c704c3831c24579be9a1aaa954cede.tar.gz
talos-openbmc-a7cf6bcd34c704c3831c24579be9a1aaa954cede.zip
fstab: require service file to mount /var - fixes BMC factory reset
This commit adds a service file requirement to fstab for mounting the ubi0:rwfs volume to /var. The required file is obmc-flash-bmc-reset.service, which, when called, will perform a BMC factory reset if the corresponding environment variable is set. This functionality was moved out of obmc-flash-bmc-ubirw.service because the factory reset is not the only procedure that calls that service. Moving this function to a new service avoids unexpected behaviors. Resolves openbmc/openbmc#2326 Change-Id: If2a9c650f315cff23040194ec87f16c05622c85e Signed-off-by: Michael Tritz <mtritz@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-core')
-rw-r--r--meta-phosphor/common/recipes-core/base-files/base-files/fstab2
1 files changed, 1 insertions, 1 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 ba65689f1..7d6ac6c6c 100644
--- a/meta-phosphor/common/recipes-core/base-files/base-files/fstab
+++ b/meta-phosphor/common/recipes-core/base-files/base-files/fstab
@@ -4,7 +4,7 @@
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 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
OpenPOWER on IntegriCloud