From db26358f7c69719a7ed0b78d66b27da9c232faba Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Wed, 25 May 2011 12:52:23 -0700 Subject: [PATCH] Handle case where same device is mounted twice http://www.virtualmin.com/node/18280 --- quota/linux-lib.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quota/linux-lib.pl b/quota/linux-lib.pl index ca6fcfba8..e4060900c 100755 --- a/quota/linux-lib.pl +++ b/quota/linux-lib.pl @@ -776,10 +776,10 @@ local $mm = $module_info{'usermin'} ? "usermount" : "mount"; local ($m, %mtab); foreach $m (&foreign_call($mm, "list_mounted", 1)) { if ($m->[3] =~ /loop=([^,]+)/) { - $mtab{&resolve_and_simplify("$1")} = $m->[0]; + $mtab{&resolve_and_simplify("$1")} ||= $m->[0]; } else { - $mtab{&resolve_and_simplify($m->[1])} = $m->[0]; + $mtab{&resolve_and_simplify($m->[1])} ||= $m->[0]; } } return %mtab;