Author: nbd Date: 2015-09-21 19:43:12 +0200 (Mon, 21 Sep 2015) New Revision: 47016
Modified: branches/chaos_calmer/package/base-files/files/lib/functions/preinit.sh Log: base-files: fix ramoverlay function with kernels 3.18+ Even though there are not many users left within the OpenWrt tree it seems this function broke during the kernel 3.18 transition. Fix it by providing a workdir as required by overlayfs. Signed-off-by: Helmut Schaa <[email protected]> Backport of r47015 Modified: branches/chaos_calmer/package/base-files/files/lib/functions/preinit.sh =================================================================== --- branches/chaos_calmer/package/base-files/files/lib/functions/preinit.sh 2015-09-21 17:41:07 UTC (rev 47015) +++ branches/chaos_calmer/package/base-files/files/lib/functions/preinit.sh 2015-09-21 17:43:12 UTC (rev 47016) @@ -75,13 +75,14 @@ } } -fopivot() { # <rw_root> <ro_root> <dupe?> - /bin/mount -o noatime,lowerdir=/,upperdir=$1 -t overlayfs "overlayfs:$1" /mnt - pivot /mnt $2 +fopivot() { # <rw_root> <work_dir> <ro_root> <dupe?> + /bin/mount -o noatime,lowerdir=/,upperdir=$1,workdir=$2 -t overlay "overlayfs:$1" /mnt + pivot /mnt $3 } ramoverlay() { mkdir -p /tmp/root /bin/mount -t tmpfs -o noatime,mode=0755 root /tmp/root - fopivot /tmp/root /rom 1 + mkdir -p /tmp/root/root /tmp/root/work + fopivot /tmp/root/root /tmp/root/work /rom 1 } _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
