aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-03-17 19:09:43 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-03-17 19:09:43 +0000
commitc46a95aa5af19074c02fbd57d54ad1abb03a09b3 (patch)
tree0f18c49eef42529ad2c2c5666e29290d5297903a
parentd5e202e2892179928b52cb2da0111f8b4d691e6d (diff)
downloadupstream-c46a95aa5af19074c02fbd57d54ad1abb03a09b3.tar.gz
upstream-c46a95aa5af19074c02fbd57d54ad1abb03a09b3.tar.bz2
upstream-c46a95aa5af19074c02fbd57d54ad1abb03a09b3.zip
base-files: overlayfs whiteouts depend on a specific xattr entry, which does not get preserved by the tmpfs->overlay copy. work around this by cleaning all copied "(overlay-whiteout)" symlinks after the switch to jffs2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26208 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/files/lib/firstboot/99_10_with_fo_cleanup12
1 files changed, 12 insertions, 0 deletions
diff --git a/package/base-files/files/lib/firstboot/99_10_with_fo_cleanup b/package/base-files/files/lib/firstboot/99_10_with_fo_cleanup
index 0833954e5b..0181b39d49 100644
--- a/package/base-files/files/lib/firstboot/99_10_with_fo_cleanup
+++ b/package/base-files/files/lib/firstboot/99_10_with_fo_cleanup
@@ -7,6 +7,18 @@ with_fo_cleanup() {
# try to get rid of /tmp/root
# this will almost always fail
umount /tmp/root 2>&-
+ grep -q overlay /proc/filesystems && {
+ cd /
+ (
+ cd /overlay
+ find -type l
+ ) | while read FILE; do
+ [ -z "$FILE" ] && break
+ if ls -la "$FILE" 2>&- | grep -q '(overlay-whiteout)'; then
+ rm -f "$FILE"
+ fi
+ done
+ }
exit 0
}