filter out extra quota restore msg on irix

Merge of master-melb:xfs-cmds:23581a by kenmcd.

  filter out extra quota restore msg on irix
This commit is contained in:
Tim Shimmin
2005-08-22 06:01:48 +00:00
parent 8f491375e5
commit 9fbd595bc6
+15 -6
View File
@@ -1290,8 +1290,8 @@ _do_invutil()
#
_check_quota()
{
usermsg=$1
groupmsg=$2
usermsg=$1
groupmsg=$2
uquota=0
gquota=0
$here/src/feature -U $SCRATCH_DEV && uquota=1
@@ -1318,10 +1318,10 @@ _check_quota()
{ print }
END {
if (uquota && !found_uquota) {
print "Missing: ", usermsg
print "Missing user quota msg:", usermsg
}
if (gquota && !found_gquota) {
print "Missing: ", groupmsg
print "Missing group quota msg:", groupmsg
}
}
'
@@ -1353,10 +1353,19 @@ _check_quota_entries()
# xfsrestore: user quota information written to ...'
# xfsrestore: group quota information written to ...'
#
# If on IRIX then look for:
# xfsrestore: use 'edquota' to restore quotas
#
_check_quota_dumprestore()
{
_check_quota 'user quota information' \
'group quota information'
if [ "$HOSTOS" == "IRIX" ]; then
_check_quota 'user quota information' \
'group quota information' |\
sed "/xfsrestore:.*use 'edquota' to restore quotas/d"
else
_check_quota 'user quota information' \
'group quota information'
fi
}
#