X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=9cf3c3d3f595e3281bd7837952fc5080f84a5264;hb=44d16aaa322bf493a7d872d18873d2f47cfcf0ab;hp=49f80a8545816fedb760fe1d148745f5bc8526eb;hpb=facd3fa17db38b76976f6a45cf7e00896d56b6fe;p=matthijs%2Fupstream%2Fbackupninja-vserver.git diff --git a/handlers/mysql b/handlers/mysql index 49f80a8..9cf3c3d 100644 --- a/handlers/mysql +++ b/handlers/mysql @@ -52,8 +52,25 @@ if [ "$user" == "" ]; then user=root; else userset=true; - userhome=`getent passwd "$user" | awk -F: '{print $6}'` - [ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf" + if [ $usevserver ] + then + userhome=`$VSERVER $vsname exec getent passwd "$user" | awk -F: '{print $6}'` + if [ $? -eq 2 ] + then + fatal "User $user not found in /etc/passwd" + fi + userhome="$VROOTDIR/$vsname$userhome" + info "User home set to: $userhome" + [ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf" + else + userhome=`getent passwd "$user" | awk -F: '{print $6}'` + if [ $? -eq 2 ] + then + fatal "User $user not found in /etc/passwd" + fi + info "User home set to: $userhome" + [ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf" + fi fi ## Prepare ignore part of the command