From bafdac1a131559e5b25c75dd43ad06457bd416fd Mon Sep 17 00:00:00 2001 From: Brandon Kim Date: Tue, 15 Jun 2021 15:29:31 -0700 Subject: meta-google: recipes-phosphor: initrdscripts: Import from gBMC Initial recipes-phosphor/initrdscripts code from gBMC. Google-Bug-Id: 179618491 Upstream: 1182879e906e67ca171b21c1eaa4027f9d162e49 Signed-off-by: Brandon Kim Change-Id: I810f3a80d635d2c3a38fcb1db7ee4c396ae2d7bb --- .../obmc-phosphor-initfs/rwfs-clean-dev.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/rwfs-clean-dev.patch (limited to 'meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/rwfs-clean-dev.patch') diff --git a/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/rwfs-clean-dev.patch b/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/rwfs-clean-dev.patch new file mode 100644 index 000000000..7631c85ce --- /dev/null +++ b/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/rwfs-clean-dev.patch @@ -0,0 +1,29 @@ +diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh +index 62be89f039..689fbea5bf 100644 +--- a/obmc-init.sh ++++ b/obmc-init.sh +@@ -275,6 +275,14 @@ then + fi + fi + ++# Ensure that we clean our rwfs on version change ++if mount $rwdev $rwdir -t $rwfst -o $rwopts; then ++ if ! cmp "$rwdir"/os-release /etc/os-release 2>/dev/null; then ++ echo "RWFS from older BMC version, cleaning" ++ touch $trigger ++ fi ++ umount "$rwdir" ++fi + if grep -w clean-rwfs-filesystem $optfile + then + echo "Cleaning of read-write overlay filesystem requested." +@@ -399,6 +407,9 @@ HERE + debug_takeover "$msg" + fi + ++# Keep track of the last version to use this rwfs ++cp /etc/os-release "$rwdir"/os-release ++ + rm -rf $work + mkdir -p $upper $work + -- cgit v1.2.3