X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql;h=f89d8d724bccd00d6a401f0cd408cb740ab2f8c9;hb=a8d99f1b1ea19e0dcd902b78dffd4c26603c93e1;hp=3b82ddf99a048051e642884fc64b60129fc6a638;hpb=b52464c19e50b738902e3333172b67d2b7c503b7;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/handlers/mysql b/handlers/mysql index 3b82ddf..f89d8d7 100644 --- a/handlers/mysql +++ b/handlers/mysql @@ -24,7 +24,7 @@ getconf configfile /etc/mysql/debian.cnf local usevserver=no local vroot if [ $vservers_are_available = yes ]; then - if [ -z "$vsname" ]; then + if [ -n "$vsname" ]; then # does it exist ? if ! vservers_exist "$vsname" ; then fatal "The vserver given in vsname ($vsname) does not exist." @@ -136,7 +136,7 @@ EOF fi fi -# if a user is not set, use $confgfile, otherwise use $mycnf +# if a user is not set, use $configfile, otherwise use $mycnf if [ "$user" == "" ]; then user=root; defaultsfile="--defaults-file=$configfile" @@ -160,7 +160,7 @@ else debug "User home set to: $userhome" [ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf" - defaultsfile="--defaults-file=$vuserhome/.my.cnf" + defaultsfile="--defaults-file=$userhome/.my.cnf" debug "using $defaultsfile" fi