Skip to content

Commit

Permalink
Merge branch 'fix-silence-mount-failures' into 'master'
Browse files Browse the repository at this point in the history
Fix spurious error msgs from live-boot about failed mounts…

See merge request live-team/live-boot!22
  • Loading branch information
rhertzog committed Sep 12, 2019
2 parents a97c74c + 5bf9f57 commit b982538
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions components/9990-misc-helpers.sh
Expand Up @@ -780,7 +780,7 @@ mount_persistence_media ()
then
mount_opts="ro,noatime"
fi
if mount -t "${fstype}" -o "${mount_opts}" "${device}" "${backing}" >/dev/null
if mount -t "${fstype}" -o "${mount_opts}" "${device}" "${backing}" >/dev/null 2>&1
then
echo ${backing}
return 0
Expand Down Expand Up @@ -1383,8 +1383,8 @@ do_union ()
# + a workdir to become mounted
# + workdir and upperdir to reside under the same mount
# + workdir and upperdir to be in separate directories
mkdir "${unionrw}/rw"
mkdir "${unionrw}/work"
mkdir -p "${unionrw}/rw"
mkdir -p "${unionrw}/work"
unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work"
;;
esac
Expand Down

0 comments on commit b982538

Please sign in to comment.