suzanne.soy/qubes-core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Voice informational messages in bind-dirs.sh

Browse Source 
Previously, bind-dirs.sh had a bunch of `true comment goes here` style debug messages (no-ops). Presumably this was done because these messages are intended as debug messages and would only be displayed when calling bind-dirs.sh with xtrace enabled. However, this includes some fatal errors, which are necessary to debug why bind-dirs.sh is ostensibly not working. For example, I tried to mount /var/lib/docker, didn't realize it did not exist (as an empty directory) in my base template, and there was no journalctl output at all. After this change, journalctl will contain the (very helpful) error message.

(cherry picked from commit 2f674c9168)
This commit is contained in:
lvh 2018-10-01 16:07:01 -05:00 committed by Marek Marczykowski-Górecki
parent 2d0d594b8d
commit da109d7e31
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vm-systemd/bind-dirs.sh
View File

@ -30,7 +30,7 @@ source /usr/lib/qubes/init/functions
prerequisite() { prerequisite() {
if ! is_rwonly_persistent ; then if ! is_rwonly_persistent ; then
true "No TemplateBasedVM detected. Exiting." echo "No TemplateBasedVM detected. Exiting."
exit 0 exit 0
fi fi
} }
@ -67,7 +67,7 @@ bind_dirs() {
fso_real_location="$(realpath "$fso_ro")" fso_real_location="$(realpath "$fso_ro")"
fso_ro="$fso_real_location" fso_ro="$fso_real_location"
else else
true "$fso_ro is not a symlink" echo "$fso_ro is not a symlink"
break break
fi fi
if [ "$symlink_level_counter" -ge "$symlink_level_max" ]; then if [ "$symlink_level_counter" -ge "$symlink_level_max" ]; then
@ -98,7 +98,7 @@ bind_dirs() {
echo "Initializing $rw_dest_dir with files from $fso_ro" >&2 echo "Initializing $rw_dest_dir with files from $fso_ro" >&2
cp --archive --recursive --parents "$fso_ro" "$rw_dest_dir" cp --archive --recursive --parents "$fso_ro" "$rw_dest_dir"
else else
true "$fso_ro is neither a directory nor a file and the path does not exist below /rw, skipping." echo "$fso_ro is neither a directory nor a file and the path does not exist below /rw, skipping."
continue continue
fi fi
fi fi