From b05065625c76c271448f493f515558cbe00b34ac Mon Sep 17 00:00:00 2001 From: intrigeri Date: Sun, 20 May 2012 13:11:12 +0200 Subject: mysql: use --skip-events when backing up the performance_schema database (Closes: #673572) --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 209eacf..f2c9270 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +version 1.0 -- UNRELEASED + handler changes + mysql: + . Use --skip-events when backing up the performance_schema database. + (Closes: #673572) + version 1.0-rc1 -- May 15, 2012 handler changes dup: -- cgit v1.2.3 From 7af82be3ecf950fd19190d06fb9ad0f3f0aca97a Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 11 Jun 2012 15:54:31 +0200 Subject: Make it clear what lockfile could not be acquired. --- ChangeLog | 2 ++ src/backupninja.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index f2c9270..faf06dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ version 1.0 -- UNRELEASED mysql: . Use --skip-events when backing up the performance_schema database. (Closes: #673572) + backupninja changes + . Make it clear what lockfile could not be acquired, if any. version 1.0-rc1 -- May 15, 2012 handler changes diff --git a/src/backupninja.in b/src/backupninja.in index 0400828..0f74906 100755 --- a/src/backupninja.in +++ b/src/backupninja.in @@ -349,7 +349,7 @@ function process_action() { else # a backup is probably ongoing already, so display an error message - debug "failed to acquire lock" + debug "failed to acquire lock $lockfile" echo "Fatal: Could not acquire lock $lockfile. A backup is probably already running for $file." >>$bufferfile fi } 200> $lockfile -- cgit v1.2.3 From 1eabbe5de7f1b583ab4f0301646a2108122602b4 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 11 Jun 2012 10:07:53 -0400 Subject: dont run lspci and modinfo when hwinfo==no --- ChangeLog | 2 ++ handlers/sys.in | 24 ++++++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index faf06dd..f2e2b7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ version 1.0 -- UNRELEASED (Closes: #673572) backupninja changes . Make it clear what lockfile could not be acquired, if any. + sys: + . Don't execute /usr/bin/lspci or /sbin/modinfo when $hardware == "no" version 1.0-rc1 -- May 15, 2012 handler changes diff --git a/handlers/sys.in b/handlers/sys.in index 74133a3..92998cc 100644 --- a/handlers/sys.in +++ b/handlers/sys.in @@ -348,13 +348,15 @@ echo "Getting information about the kernel." echo STATUS="Getting kernel version:" catifexec "/bin/uname" "-a" -STATUS="Checking module information:" -catifexec "/sbin/lsmod" -for x in $(/sbin/lsmod | /usr/bin/cut -f1 -d" " 2>/dev/null | /bin/grep -v Module 2>/dev/null -) ; do - STATUS="Checking module information $x:" - catifexec "/sbin/modinfo" "$x" -done +if [ "$hardware" == "yes" ]; then + STATUS="Checking module information:" + catifexec "/sbin/lsmod" + for x in $(/sbin/lsmod | /usr/bin/cut -f1 -d" " 2>/dev/null | /bin/grep -v Module 2>/dev/null + ) ; do + STATUS="Checking module information $x:" + catifexec "/sbin/modinfo" "$x" + done +fi STATUS="Gathering information about your filesystems:" catiffile "/proc/filesystems" @@ -432,9 +434,11 @@ catiffile "/proc/rtc" STATUS="Gathering information about your ide drivers:" catiffile "/proc/ide" -STATUS="Gathering information about your bus:" -catifexec "/usr/bin/lspci" -catiffile "/proc/bus" +if [ "$hardware" == "yes" ]; then + STATUS="Gathering information about your bus:" + catifexec "/usr/bin/lspci" + catiffile "/proc/bus" +fi echo echo "Getting disk and filesystem information." -- cgit v1.2.3 From 7d4ef67e2202fb80c341f1dee80baf8d69aa55fc Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 15 Jun 2012 20:35:04 +0200 Subject: Update and fix ChangeLog. --- ChangeLog | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index f2e2b7c..f8c9a03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,10 +3,15 @@ version 1.0 -- UNRELEASED mysql: . Use --skip-events when backing up the performance_schema database. (Closes: #673572) - backupninja changes - . Make it clear what lockfile could not be acquired, if any. + rsync: + . Generate excludes command-line snippet the same way as + the duplicity handler does. + . Run rsync command-line through a shell, so that single-quotes + around excludes are interpreted (Closes: #677410) sys: . Don't execute /usr/bin/lspci or /sbin/modinfo when $hardware == "no" + backupninja changes + . Make it clear what lockfile could not be acquired, if any. version 1.0-rc1 -- May 15, 2012 handler changes -- cgit v1.2.3 From aae966981e259b11afc1e01b68d4fa7c59cde646 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 15 Jun 2012 20:35:12 +0200 Subject: Releasing backupninja 1.0. (Happy birthdays!) --- ChangeLog | 3 ++- configure.in | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index f8c9a03..179d52f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ -version 1.0 -- UNRELEASED +version 1.0 -- June 15, 2012 + The "happy birthdays" release! handler changes mysql: . Use --skip-events when backing up the performance_schema database. diff --git a/configure.in b/configure.in index 3cddf61..dcb8c24 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ # The maintainer mode is causing me grief with newest versions of autotools #AM_MAINTAINER_MODE -AC_INIT([backupninja],[1.0-rc1],[backupninja@lists.riseup.net]) +AC_INIT([backupninja],[1.0],[backupninja@lists.riseup.net]) AC_CONFIG_SRCDIR([src/backupninja.in]) AM_INIT_AUTOMAKE -- cgit v1.2.3