Skip to content

Commit 7f056eb

Browse files
update mounpoint check
redirect stdout to /dev/null in is_mountpoint()
1 parent 72c6407 commit 7f056eb

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

plugins/envsetup

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,18 @@ do_mount() {
8484
points="$chroot_dir/dev $chroot_dir/sys $chroot_dir/proc"
8585
see_for_directory "$points"
8686

87-
if ! is_mounted "$chroot_dir/dev" >>/dev/null; then
87+
if ! is_mounted "$chroot_dir/dev"; then
8888
shout "mounting: $chroot_dir/dev"
8989
$SUDO mount -o bind /dev "$chroot_dir"/dev
9090
$SUDO mount --bind /dev/pts "$chroot_dir"/dev/pts
9191
fi
9292

93-
if ! is_mounted "$chroot_dir"/proc >>/dev/null; then
93+
if ! is_mounted "$chroot_dir"/proc; then
9494
shout "mounting: $chroot_dir/proc"
95-
$SUDO mount -t proc /proc $chroot_dir/proc
95+
$SUDO mount -t proc /proc "$chroot_dir"/proc
9696
fi
9797

98-
if ! is_mounted "$chroot_dir"/sys >>/dev/null; then
98+
if ! is_mounted "$chroot_dir"/sys; then
9999
shout "mounting: $chroot_dir/sys"
100100
$SUDO mount -t sysfs /sys "$chroot_dir"/sys
101101
fi
@@ -106,18 +106,18 @@ do_unmount()
106106
local chroot_dir=$1
107107
points="$chroot_dir/dev $chroot_dir/sys $chroot_dir/proc"
108108
see_for_directory "$points"
109-
if is_mounted "$chroot_dir/dev" >>/dev/null; then
109+
if is_mounted "$chroot_dir/dev"; then
110110
shout "unmounting: $chroot_dir/dev"
111111
$SUDO umount "$chroot_dir"/dev/pts
112112
$SUDO umount "$chroot_dir"/dev
113113
fi
114114

115-
if is_mounted "$chroot_dir"/proc >>/dev/null; then
115+
if is_mounted "$chroot_dir"/proc; then
116116
shout "unmounting: $chroot_dir/proc"
117117
$SUDO umount $chroot_dir/proc
118118
fi
119119

120-
if is_mounted "$chroot_dir"/sys >>/dev/null; then
120+
if is_mounted "$chroot_dir"/sys; then
121121
shout "unmounting: $chroot_dir/sys"
122122
$SUDO umount "$chroot_dir"/sys
123123
fi
@@ -126,7 +126,7 @@ do_unmount()
126126
is_mounted() {
127127
local chroot_dir=$1
128128
if [ -d "$chroot_dir" ]; then
129-
if mountpoint -q "$chroot_dir"; then
129+
if mountpoint -q "$chroot_dir" >> /dev/null; then
130130
return 0
131131
else
132132
return 1

0 commit comments

Comments
 (0)