Commit f8e2f9f8 authored by Alan's avatar Alan

ASP: reset ASP configuration file with correct mode

The fix for #15781 was incomplete as it failed to reset
live-additional-software.conf with correct premissions it they were wrong in
the first place.
parent 3806bec3
......@@ -356,12 +356,16 @@ activate_volumes ()
# has wrong access rights.
if [ "$ACCESS_RIGHTS_ARE_CORRECT" != true ]
then
for f in $(ls /live/persistence/*_unlocked/persistence.conf \
/live/persistence/*_unlocked/live-additional-software.conf || true)
for f in $(ls /live/persistence/*_unlocked/persistence.conf || true)
do
warning "Disabling '$f': persistent volume has unsafe access rights"
disable_and_create_empty_persistence_conf_file "$f"
done
for f in $(ls /live/persistence/*_unlocked/live-additional-software.conf || true)
do
warning "Disabling '$f': persistent volume has unsafe access rights"
disable_and_create_empty_persistence_conf_file "$f" "644"
done
fi
# Regardless of the mountpoint access rights, disable persistence
......@@ -383,7 +387,7 @@ activate_volumes ()
if ! persistence_conf_file_has_correct_access_rights "$f" "644"
then
warning "Disabling '$f', that has unsafe access rights"
disable_and_create_empty_persistence_conf_file "$f"
disable_and_create_empty_persistence_conf_file "$f" "644"
fi
done
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment