Merge pull request #69 from mailinglists35/patch-4

make --quiet really quiet
Merge pull request #68 from lindhe/fix-broken-cron
2025-08-18 00:20:06 +02:00 · 2017-09-14 11:22:43 +02:00 · 2017-07-11 13:44:13 +02:00 · 2017-07-06 13:15:56 +03:00 · 2017-07-06 09:20:54 +02:00 · 2017-07-05 23:21:29 +02:00
5 changed files with 9 additions and 9 deletions
--- a/etc/zfs-auto-snapshot.cron.daily
+++ b/etc/zfs-auto-snapshot.cron.daily
@@ -1,5 +1,5 @@
 #!/bin/sh

 # Only call zfs-auto-snapshot if it's available
-exec which zfs-auto-snapshot > /dev/null && \
-     zfs-auto-snapshot --quiet --syslog --label=daily --keep=31 //
+which zfs-auto-snapshot > /dev/null && \
+     exec zfs-auto-snapshot --quiet --syslog --label=daily --keep=31 //
--- a/etc/zfs-auto-snapshot.cron.hourly
+++ b/etc/zfs-auto-snapshot.cron.hourly
@@ -1,5 +1,5 @@
 #!/bin/sh

 # Only call zfs-auto-snapshot if it's available
-exec which zfs-auto-snapshot > /dev/null && \
-     zfs-auto-snapshot --quiet --syslog --label=hourly --keep=24 //
+which zfs-auto-snapshot > /dev/null && \
+     exec zfs-auto-snapshot --quiet --syslog --label=hourly --keep=24 //
--- a/etc/zfs-auto-snapshot.cron.monthly
+++ b/etc/zfs-auto-snapshot.cron.monthly
@@ -1,5 +1,5 @@
 #!/bin/sh

 # Only call zfs-auto-snapshot if it's available
-exec which zfs-auto-snapshot > /dev/null && \
-     zfs-auto-snapshot --quiet --syslog --label=monthly --keep=12 //
+which zfs-auto-snapshot > /dev/null && \
+     exec zfs-auto-snapshot --quiet --syslog --label=monthly --keep=12 //
--- a/etc/zfs-auto-snapshot.cron.weekly
+++ b/etc/zfs-auto-snapshot.cron.weekly
@@ -1,5 +1,5 @@
 #!/bin/sh

 # Only call zfs-auto-snapshot if it's available
-exec which zfs-auto-snapshot > /dev/null && \
-     zfs-auto-snapshot --quiet --syslog --label=weekly --keep=8 //
+which zfs-auto-snapshot > /dev/null && \
+     exec zfs-auto-snapshot --quiet --syslog --label=weekly --keep=8 //
--- a/src/zfs-auto-snapshot.sh
+++ b/src/zfs-auto-snapshot.sh
@@ -110,7 +110,7 @@ print_log () # level, message, ...
 			;;
 		(inf*)
 			# test -n "$opt_syslog" && logger -t "$opt_prefix" -p daemon.info $*
-			test -n "$opt_verbose" && echo $*
+			test -z ${opt_quiet+x} && test -n "$opt_verbose" && echo $*
 			;;
 		(deb*)
 			# test -n "$opt_syslog" && logger -t "$opt_prefix" -p daemon.debug $*
Author	SHA1	Message	Date
Jonathan Carter	d49be6a2de	Merge pull request #69 from mailinglists35/patch-4 make --quiet really quiet	2017-09-14 11:22:43 +02:00
Jonathan Carter	2e1f309131	Merge pull request #68 from lindhe/fix-broken-cron Fix broken cron scripts	2017-07-11 13:44:13 +02:00
mailinglists35	1666623191	make --quiet really quiet --quiet still prints the name of the datasets when print_log is called at lines 548/551	2017-07-06 13:15:56 +03:00
Andreas Lindhé	739972f18a	Found a way to exec the process and yet have it work	2017-07-06 09:20:54 +02:00
Andreas Lindhé	8c45add2c0	Fix broken cron scripts I found that none of the daily, hourly, weekly or monthly snapshots were being taken. When I looked into it I found that the scripts didn't execute properly, because of the newly introduced check (`9c6f065`). I'm not versed enough with POSIX to understand if there was some clever intention with using exec than just calling which by it self, but it works without exec so I removed it.	2017-07-05 23:21:29 +02:00