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

Merge remote-tracking branch 'qubesos/pr/43'

Browse Source 
* qubesos/pr/43:
  Fix more shellcheck warnings
  Fix handling of binds containing spaces
This commit is contained in:
Marek Marczykowski-Górecki 2017-03-17 11:56:22 +01:00
commit d177e73bba
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# Source Qubes library. # Source Qubes library.
. /usr/lib/qubes/init/functions source /usr/lib/qubes/init/functions
prerequisite() { prerequisite() {
if ! is_rwonly_persistent ; then if ! is_rwonly_persistent ; then
@ -55,7 +55,7 @@ bind_dirs() {
## ro: read-only ## ro: read-only
## rw: read-write ## rw: read-write
for fso_ro in ${binds[@]}; do for fso_ro in "${binds[@]}"; do
local symlink_level_counter local symlink_level_counter
symlink_level_counter="0" symlink_level_counter="0"
@ -117,6 +117,7 @@ main() {
bind_dirs "$@" bind_dirs "$@"
} }
binds=()
for source_folder in /usr/lib/qubes-bind-dirs.d /etc/qubes-bind-dirs.d /rw/config/qubes-bind-dirs.d ; do for source_folder in /usr/lib/qubes-bind-dirs.d /etc/qubes-bind-dirs.d /rw/config/qubes-bind-dirs.d ; do
true "source_folder: $source_folder" true "source_folder: $source_folder"
if [ ! -d "$source_folder" ]; then if [ ! -d "$source_folder" ]; then
@ -124,6 +125,7 @@ for source_folder in /usr/lib/qubes-bind-dirs.d /etc/qubes-bind-dirs.d /rw/confi
fi fi
for file_name in "$source_folder/"*".conf" ; do for file_name in "$source_folder/"*".conf" ; do
bash -n "$file_name" bash -n "$file_name"
# shellcheck source=/dev/null
source "$file_name" source "$file_name"
done done
done done