summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaptor Engineering Development Team <support@raptorengineering.com>2018-03-02 20:59:40 -0600
committerRaptor Engineering Development Team <support@raptorengineering.com>2018-04-12 21:09:53 -0500
commitbdec599c68fba7d5738189e9078ff6452e555211 (patch)
tree7fc7ec5573dabe7e5728d54c1267559d10907e53
parent5b19fc55ebac40fb13bb4574771022a72f9d00b0 (diff)
downloadtalos-openbmc-bdec599c68fba7d5738189e9078ff6452e555211.tar.gz
talos-openbmc-bdec599c68fba7d5738189e9078ff6452e555211.zip
Work around upstream BMC bug 2946
-rw-r--r--import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-live.sh11
-rw-r--r--meta-phosphor/common/recipes-phosphor/initfs/files/obmc-init.sh11
2 files changed, 20 insertions, 2 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-live.sh b/import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-live.sh
index 46cab6cc7..d3470e24f 100644
--- a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -192,7 +192,16 @@ mount_and_boot() {
fatal "Could not move rootfs mount point"
else
mount -t tmpfs -o rw,noatime,mode=755 tmpfs /rootfs.rw
- mkdir -p /rootfs.rw/upperdir /rootfs.rw/work
+ if ! mkdir -p /rootfs.rw/upperdir /rootfs.rw/work; then
+ # Clean up generated files and retry directory creation
+ echo "Out of space on persistent RW partition. Attempting to clean up generated files..."
+ ORIG_PWD="$PWD"
+ cd /rootfs.rw/cow
+ ls | grep -v etc | grep -v var | xargs rm -rf
+ rm -rf var/lib/phosphor*
+ cd "$ORIG_PWD"
+ mkdir -p /rootfs.rw/upperdir /rootfs.rw/work
+ fi
mount -t overlay overlay -o "lowerdir=/rootfs.ro,upperdir=/rootfs.rw/upperdir,workdir=/rootfs.rw/work" $ROOT_MOUNT
mkdir -p $ROOT_MOUNT/rootfs.ro $ROOT_MOUNT/rootfs.rw
mount --move /rootfs.ro $ROOT_MOUNT/rootfs.ro
diff --git a/meta-phosphor/common/recipes-phosphor/initfs/files/obmc-init.sh b/meta-phosphor/common/recipes-phosphor/initfs/files/obmc-init.sh
index afa8ac1e3..393117a46 100644
--- a/meta-phosphor/common/recipes-phosphor/initfs/files/obmc-init.sh
+++ b/meta-phosphor/common/recipes-phosphor/initfs/files/obmc-init.sh
@@ -386,7 +386,16 @@ HERE
fi
rm -rf $work
-mkdir -p $upper $work
+if ! mkdir -p $upper $work; then
+ # Clean up generated files and retry directory creation
+ echo "Out of space on persistent RW partition. Attempting to clean up generated files..."
+ ORIG_PWD="$PWD"
+ cd $upper
+ ls | grep -v etc | grep -v var | xargs rm -rf
+ rm -rf var/lib/phosphor*
+ cd "$ORIG_PWD"
+ mkdir -p $upper $work
+fi
mount -t overlay -o lowerdir=$rodir,upperdir=$upper,workdir=$work cow /root
OpenPOWER on IntegriCloud