initscripts: remove warnings on read-only-rootfs (again)
PATCH 1/1 initscripts: remove warnings on read-only-rootfs (again)
When the populate-volatile.sh initscript tests if a configured symlink is already in place, it uses readlink with the '-f' (follow) option:
Quoted 1 line
[ "$(readlink -f $source)" = "$dest" ]
If the test fails, it proceeds to delete the exisiting folder/file, and create the configured symlink.
However, the '-f' option to readlink makes it follow symlinks pointing at symlinks. If the $dest argument is a symlink, the above test fails, and warnings are printed due to changing a read-only rootfs.
This is the case for /tmp, and /etc/resolv.conf:
Quoted 2 lines
/tmp ->
/var/tmp->/var/volatile/tmp/etc/resolv.conf->/var/run/resolv.conf->/run/resolv.conf
Fix the warnings by removing the '-f' option, so that the test matches the configuration.
--- .../initscripts/initscripts-1.0/populate-volatile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh +1 -1
@@ -80,7 +80,7 @@ mk_dir() { link_file() { EXEC=" if [ -L \"$2\" ]; then - [ \"\$(readlink -f \"$2\")\" != \"$1\" ] && { rm -f \"$2\"; ln -sf \"$1\" \"$2\"; }; + [ \"\$(readlink \"$2\")\" != \"$1\" ] && { rm -f \"$2\"; ln -sf \"$1\" \"$2\"; }; elif [ -d \"$2\" ]; then if awk '\$2 == \"$2\" {exit 1}' /proc/mounts; then cp -a $2/* $1 2>/dev/null;
Signature · 1 line
2.18.0
Quoted 41 lines · Martin Hundebøll
When the
populate-volatile.shinitscript tests if a configured symlink is already in place, it uses readlink with the '-f' (follow) option:Quoted 1 line
[ "$(readlink -f $source)" = "$dest" ]
If the test fails, it proceeds to delete the exisiting folder/file, and create the configured symlink.
However, the '-f' option to readlink makes it follow symlinks pointing at symlinks. If the $dest argument is a symlink, the above test fails, and warnings are printed due to changing a read-only rootfs.
This is the case for /tmp, and
/etc/resolv.conf:Quoted 2 lines
/tmp ->
/var/tmp->/var/volatile/tmp/etc/resolv.conf->/var/run/resolv.conf->/run/resolv.confFix the warnings by removing the '-f' option, so that the test matches the configuration.
Signed-off-by Martin Hundebøll <[email protected]>--- .../initscripts/initscripts-1.0/populate-volatile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh +1
-2@@ -80,7 +80,7 @@ mk_dir() { link_file() { EXEC=" if [ -L \"$2\" ]; then - [ \"\$(readlink -f \"$2\")\" != \"$1\" ] && { rm -f \"$2\"; ln -sf \"$1\" \"$2\"; }; + [ \"\$(readlink \"$2\")\" != \"$1\" ] && { rm -f \"$2\"; ln -sf \"$1\" \"$2\"; }; elif [ -d \"$2\" ]; then if awk '\$2 == \"$2\" {exit 1}' /proc/mounts; then cp -a $2/* $1 2>/dev/null; --2.18.0
Quoted 5 lines
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
ping ?
This patch prevents some warnings related to /tmp and /etc/resolv.conf from being printed, when using read-only-rootfs. Would be nice to have the same fix backported to sumo too.
/Jacob