diff options
| author | rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4> | 2007-12-18 22:13:41 +0000 |
|---|---|---|
| committer | rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4> | 2007-12-18 22:13:41 +0000 |
| commit | 2308d5bfd885e829d4ae9f193db92bcc17519aa5 (patch) | |
| tree | 436ad427f930736a654e07d2c2a21450c306039e /app/backup | |
| parent | 53d059a093bc2d2558fb950d998a53ec27bc7c2e (diff) | |
| download | slackbuilds-2308d5bfd885e829d4ae9f193db92bcc17519aa5.tar.gz slackbuilds-2308d5bfd885e829d4ae9f193db92bcc17519aa5.tar.bz2 | |
backupninja: updated 0.9.5 patch
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1542 370017ae-e619-0410-ac65-c121f96126d4
Diffstat (limited to 'app/backup')
| -rw-r--r-- | app/backup/backupninja/backupninja-0.9.5.diff | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/app/backup/backupninja/backupninja-0.9.5.diff b/app/backup/backupninja/backupninja-0.9.5.diff index 7849fa2b..a9e924a0 100644 --- a/app/backup/backupninja/backupninja-0.9.5.diff +++ b/app/backup/backupninja/backupninja-0.9.5.diff @@ -1,6 +1,6 @@ diff -Naur backupninja-0.9.5.orig/handlers/mysql.in backupninja-0.9.5/handlers/mysql.in --- backupninja-0.9.5.orig/handlers/mysql.in 2007-11-19 23:28:49.000000000 -0200 -+++ backupninja-0.9.5/handlers/mysql.in 2007-12-18 19:45:07.000000000 -0200 ++++ backupninja-0.9.5/handlers/mysql.in 2007-12-18 20:09:48.000000000 -0200 @@ -91,8 +91,7 @@ then if [ $usevserver = yes ] @@ -19,18 +19,18 @@ diff -Naur backupninja-0.9.5.orig/handlers/mysql.in backupninja-0.9.5/handlers/m - if [ -f $mycnf ] + + if [ $usevserver = yes ] - then -- # rename temporarily -- tmpcnf="$home/my.cnf.disable" -- debug "mv $mycnf $tmpcnf" -- mv $mycnf $tmpcnf ++ then + workcnf="$vroot$mycnf" + else + workcnf="$mycnf" + fi + + if [ -f $workcnf ] -+ then + then +- # rename temporarily +- tmpcnf="$home/my.cnf.disable" +- debug "mv $mycnf $tmpcnf" +- mv $mycnf $tmpcnf + # rename temporarily + tmpcnf="$workcnf.disable" + debug "mv $workcnf $tmpcnf" @@ -44,8 +44,15 @@ diff -Naur backupninja-0.9.5.orig/handlers/mysql.in backupninja-0.9.5/handlers/m # auto generated backupninja mysql conf [mysql] host=$dbhost -@@ -129,12 +135,7 @@ +@@ -127,14 +133,14 @@ + host=$dbhost + user=$dbusername password="$dbpassword" ++ ++[mysqladmin] ++host=$dbhost ++user=$dbusername ++password="$dbpassword" EOF umask $oldmask - if [ $usevserver = yes ] @@ -58,7 +65,7 @@ diff -Naur backupninja-0.9.5.orig/handlers/mysql.in backupninja-0.9.5/handlers/m fi # if a user is not set, use $configfile, otherwise use $mycnf -@@ -145,22 +146,23 @@ +@@ -145,22 +151,23 @@ userset=true; if [ $usevserver = yes ] then @@ -87,7 +94,7 @@ diff -Naur backupninja-0.9.5.orig/handlers/mysql.in backupninja-0.9.5/handlers/m defaultsfile="--defaults-extra-file=$userhome/.my.cnf" debug "using $defaultsfile" fi -@@ -310,12 +312,12 @@ +@@ -310,12 +317,12 @@ if [ "$dbusername" != "" -a "$dbpassword" != "" ] then ## clean up tmp config file |