Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/137'

Browse Source 
* origin/pr/137:
  Voice informational messages in bind-dirs.sh
This commit is contained in:
Marek Marczykowski-Górecki 2018-10-10 00:01:15 +02:00
commit fae277bca0
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

@ -31,7 +31,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
} }
@ -68,7 +68,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
@ -99,7 +99,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