commit btrfsmaintenance for openSUSE:Factory
Hello community, here is the log from the commit of package btrfsmaintenance for openSUSE:Factory checked in at 2019-06-24 21:49:20 Comparing /work/SRC/openSUSE:Factory/btrfsmaintenance (Old) and /work/SRC/openSUSE:Factory/.btrfsmaintenance.new.4615 (New) Package is "btrfsmaintenance" Mon Jun 24 21:49:20 2019 rev:21 rq:709216 version:0.4.2 Changes: --- /work/SRC/openSUSE:Factory/btrfsmaintenance/btrfsmaintenance.changes 2019-03-20 13:17:35.981366989 +0100 +++ /work/SRC/openSUSE:Factory/.btrfsmaintenance.new.4615/btrfsmaintenance.changes 2019-06-24 21:49:21.455919593 +0200 @@ -1,0 +2,11 @@ +Tue Jun 11 16:34:56 CEST 2019 - dste...@suse.cz + +- spec: fix typo in macro name + +--- +Tue Jun 11 12:34:37 UTC 2019 - Dominique Leuenberger + +- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to + shortcut the build queues by allowing usage of systemd-mini + +--- Other differences: -- ++ btrfsmaintenance.spec ++ --- /var/tmp/diff_new_pack.1Nraem/_old 2019-06-24 21:49:23.023920804 +0200 +++ /var/tmp/diff_new_pack.1Nraem/_new 2019-06-24 21:49:23.043920820 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -35,12 +35,12 @@ Patch3: 0003-sysconfig-document-using-systemd.time-7-for-frequenc.patch Patch4: 0004-btrfsmaintenance-refresh-cron.sh-validate-periods-fo.patch Patch5: 0005-btrfs-defrag-plugin-remove-dependency-on-zypp-plugin.patch -BuildRequires: systemd +BuildRequires: pkgconfig(systemd) Requires: btrfsprogs Requires: libzypp(plugin:commit) Supplements:btrfsprogs BuildArch: noarch -%{?systemd_requires} +%{?systemd_ordering} %description Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag
commit btrfsmaintenance for openSUSE:Factory
Hello community, here is the log from the commit of package btrfsmaintenance for openSUSE:Factory checked in at 2018-09-26 14:23:29 Comparing /work/SRC/openSUSE:Factory/btrfsmaintenance (Old) and /work/SRC/openSUSE:Factory/.btrfsmaintenance.new (New) Package is "btrfsmaintenance" Wed Sep 26 14:23:29 2018 rev:19 rq:638213 version:0.4.2 Changes: --- /work/SRC/openSUSE:Factory/btrfsmaintenance/btrfsmaintenance.changes 2018-05-16 11:44:03.146929174 +0200 +++ /work/SRC/openSUSE:Factory/.btrfsmaintenance.new/btrfsmaintenance.changes 2018-09-26 14:23:31.941911238 +0200 @@ -1,0 +2,9 @@ +Tue Sep 25 00:00:00 CEST 2018 - dste...@suse.cz + +- update to version 0.4.2 + - CVE-2018-14722: expand auto mountpoints in a safe way + - btrfs-defrag: fix missing function to detect btrfs filesystems (#52) + - btrfs-trim: more verbose fstrim output (#60) + - dist-install: print information about timer unit installation (#58) + +--- Old: btrfsmaintenance-0.4.1.tar.bz2 New: btrfsmaintenance-0.4.2.tar.bz2 Other differences: -- ++ btrfsmaintenance.spec ++ --- /var/tmp/diff_new_pack.QWHrmH/_old 2018-09-26 14:23:32.525910308 +0200 +++ /var/tmp/diff_new_pack.QWHrmH/_new 2018-09-26 14:23:32.529910302 +0200 @@ -22,7 +22,7 @@ %endif Name: btrfsmaintenance -Version:0.4.1 +Version:0.4.2 Release:0 Summary:Scripts for btrfs periodic maintenance tasks License:GPL-2.0-only ++ btrfsmaintenance-0.4.1.tar.bz2 -> btrfsmaintenance-0.4.2.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.4.1/btrfs-balance.sh new/btrfsmaintenance-0.4.2/btrfs-balance.sh --- old/btrfsmaintenance-0.4.1/btrfs-balance.sh 2018-03-15 18:49:36.413244400 +0100 +++ new/btrfsmaintenance-0.4.2/btrfs-balance.sh 2018-09-25 16:07:15.938261172 +0200 @@ -18,7 +18,7 @@ . $(dirname $(realpath "$0"))/btrfsmaintenance-functions { -evaluate_auto_mountpoint BTRFS_BALANCE_MOUNTPOINTS +BTRFS_BALANCE_MOUNTPOINTS=$(expand_auto_mountpoint "$BTRFS_BALANCE_MOUNTPOINTS") OIFS="$IFS" IFS=: exec 2>&1 # redirect stderr to stdout to catch all output to log destination diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.4.1/btrfs-defrag.sh new/btrfsmaintenance-0.4.2/btrfs-defrag.sh --- old/btrfsmaintenance-0.4.1/btrfs-defrag.sh 2018-03-15 18:49:36.413244400 +0100 +++ new/btrfsmaintenance-0.4.2/btrfs-defrag.sh 2018-09-25 16:07:15.938261172 +0200 @@ -15,6 +15,7 @@ fi LOGIDENTIFIER='btrfs-defrag' +. $(dirname $(realpath "$0"))/btrfsmaintenance-functions { OIFS="$IFS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.4.1/btrfs-scrub.sh new/btrfsmaintenance-0.4.2/btrfs-scrub.sh --- old/btrfsmaintenance-0.4.1/btrfs-scrub.sh 2018-03-15 18:49:36.413244400 +0100 +++ new/btrfsmaintenance-0.4.2/btrfs-scrub.sh 2018-09-25 16:07:15.938261172 +0200 @@ -29,7 +29,7 @@ fi { -evaluate_auto_mountpoint BTRFS_SCRUB_MOUNTPOINTS +BTRFS_SCRUB_MOUNTPOINTS=$(expand_auto_mountpoint "$BTRFS_SCRUB_MOUNTPOINTS") OIFS="$IFS" IFS=: exec 2>&1 # redirect stderr to stdout to catch all output to log destination diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.4.1/btrfs-trim.sh new/btrfsmaintenance-0.4.2/btrfs-trim.sh --- old/btrfsmaintenance-0.4.1/btrfs-trim.sh2018-03-15 18:49:36.413244400 +0100 +++ new/btrfsmaintenance-0.4.2/btrfs-trim.sh2018-09-25 16:07:15.942261161 +0200 @@ -18,7 +18,7 @@ . $(dirname $(realpath "$0"))/btrfsmaintenance-functions { -evaluate_auto_mountpoint BTRFS_TRIM_MOUNTPOINTS +BTRFS_TRIM_MOUNTPOINTS=$(expand_auto_mountpoint "$BTRFS_TRIM_MOUNTPOINTS") OIFS="$IFS" IFS=: exec 2>&1 # redirect stderr to stdout to catch all output to log destination @@ -29,7 +29,7 @@ continue fi echo "Running fstrim on $MNT" - fstrim "$MNT" + fstrim --verbose "$MNT" done } | \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.4.1/btrfsmaintenance-functions new/btrfsmaintenance-0.4.2/btrfsmaintenance-functions --- old/btrfsmaintenance-0.4.1/btrfsmaintenance-functions 2018-03-15 18:49:36.433244400 +0100 +++ new/btrfsmaintenance-0.4.2/btrfsmaintenance-functions 2018-09-25 16:07:15.982261063 +0200 @@ -3,23 +3,24 @@ # this file contains common code for the btrfs maintenance scripts # -# function: evaluate_auto_mountpoint -# parameter: A variable name +# function: expand_auto_mountpoint
commit btrfsmaintenance for openSUSE:Factory
Hello community, here is the log from the commit of package btrfsmaintenance for openSUSE:Factory checked in at 2018-05-16 11:42:30 Comparing /work/SRC/openSUSE:Factory/btrfsmaintenance (Old) and /work/SRC/openSUSE:Factory/.btrfsmaintenance.new (New) Package is "btrfsmaintenance" Wed May 16 11:42:30 2018 rev:18 rq:607656 version:0.4.1 Changes: --- /work/SRC/openSUSE:Factory/btrfsmaintenance/btrfsmaintenance.changes 2018-03-16 10:45:39.475485056 +0100 +++ /work/SRC/openSUSE:Factory/.btrfsmaintenance.new/btrfsmaintenance.changes 2018-05-16 11:44:03.146929174 +0200 @@ -1,0 +2,7 @@ +Fri Apr 13 13:48:40 UTC 2018 - lpecha...@suse.com + +- In openSUSE the defrag plugin must explicitly refer to Python 3. + (bsc#1070322) +- Added patch: python3-support-bsc1070322.diff + +--- New: python3-support-bsc1070322.diff Other differences: -- ++ btrfsmaintenance.spec ++ --- /var/tmp/diff_new_pack.cpnFqK/_old 2018-05-16 11:44:03.874902676 +0200 +++ /var/tmp/diff_new_pack.cpnFqK/_new 2018-05-16 11:44:03.874902676 +0200 @@ -29,6 +29,7 @@ Group: System/Base Url:https://github.com/kdave/btrfsmaintenance Source0:%{name}-%{version}.tar.bz2 +Patch0: python3-support-bsc1070322.diff BuildRequires: systemd Requires: btrfsprogs Requires: python3-zypp-plugin @@ -44,6 +45,7 @@ %prep %setup -q +%patch0 -p1 %build ++ python3-support-bsc1070322.diff ++ As per explanation in https://bugzilla.suse.com/show_bug.cgi?id=1070322#c10 python3 must be called. Index: btrfsmaintenance-0.4.1/btrfs-defrag-plugin.py === --- btrfsmaintenance-0.4.1.orig/btrfs-defrag-plugin.py +++ btrfsmaintenance-0.4.1/btrfs-defrag-plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # This plugin defragments rpm files after update. #
commit btrfsmaintenance for openSUSE:Factory
Hello community, here is the log from the commit of package btrfsmaintenance for openSUSE:Factory checked in at 2018-03-16 10:44:46 Comparing /work/SRC/openSUSE:Factory/btrfsmaintenance (Old) and /work/SRC/openSUSE:Factory/.btrfsmaintenance.new (New) Package is "btrfsmaintenance" Fri Mar 16 10:44:46 2018 rev:17 rq:587598 version:0.4.1 Changes: --- /work/SRC/openSUSE:Factory/btrfsmaintenance/btrfsmaintenance.changes 2018-03-13 10:24:41.756357201 +0100 +++ /work/SRC/openSUSE:Factory/.btrfsmaintenance.new/btrfsmaintenance.changes 2018-03-16 10:45:39.475485056 +0100 @@ -1,0 +2,10 @@ +Thu Mar 15 00:00:00 CET 2018 - dste...@suse.cz + +- update to version 0.4.1 + - defrag plugin: python2 and 3 compatibility + - defrag plugin: target extent size lowered to 32MiB (#43) + - shell compatibility fixes + - systemd unit type fixes +- Removed patch: python3-support-bsc1070322.diff (upstream) + +--- Old: btrfsmaintenance-0.4.tar.bz2 python3-support-bsc1070322.diff New: btrfsmaintenance-0.4.1.tar.bz2 Other differences: -- ++ btrfsmaintenance.spec ++ --- /var/tmp/diff_new_pack.u0Bwql/_old 2018-03-16 10:45:40.323454522 +0100 +++ /var/tmp/diff_new_pack.u0Bwql/_new 2018-03-16 10:45:40.327454378 +0100 @@ -22,14 +22,13 @@ %endif Name: btrfsmaintenance -Version:0.4 +Version:0.4.1 Release:0 Summary:Scripts for btrfs periodic maintenance tasks License:GPL-2.0-only Group: System/Base Url:https://github.com/kdave/btrfsmaintenance Source0:%{name}-%{version}.tar.bz2 -Patch0: python3-support-bsc1070322.diff BuildRequires: systemd Requires: btrfsprogs Requires: python3-zypp-plugin @@ -40,11 +39,11 @@ %description Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag -on selected mountpoints or directories. +on selected mountpoints or directories. Hints for periodic snapshot tuning (eg. +for snapper). %prep %setup -q -%patch0 -p1 %build ++ btrfsmaintenance-0.4.tar.bz2 -> btrfsmaintenance-0.4.1.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.4/btrfs-balance.service new/btrfsmaintenance-0.4.1/btrfs-balance.service --- old/btrfsmaintenance-0.4/btrfs-balance.service 2018-01-15 17:40:06.389987125 +0100 +++ new/btrfsmaintenance-0.4.1/btrfs-balance.service2018-03-15 18:49:36.417244400 +0100 @@ -4,7 +4,7 @@ After=fstrim.service btrfs-trim.service btrfs-scrub.service [Service] -Type=oneshot +Type=simple ExecStart=/usr/share/btrfsmaintenance/btrfs-balance.sh IOSchedulingClass=idle CPUSchedulingPolicy=idle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.4/btrfs-balance.sh new/btrfsmaintenance-0.4.1/btrfs-balance.sh --- old/btrfsmaintenance-0.4/btrfs-balance.sh 2018-01-15 17:40:06.385987125 +0100 +++ new/btrfsmaintenance-0.4.1/btrfs-balance.sh 2018-03-15 18:49:36.413244400 +0100 @@ -15,7 +15,7 @@ fi LOGIDENTIFIER='btrfs-balance' -. $(dirname $(realpath $0))/btrfsmaintenance-functions +. $(dirname $(realpath "$0"))/btrfsmaintenance-functions { evaluate_auto_mountpoint BTRFS_BALANCE_MOUNTPOINTS @@ -24,7 +24,7 @@ exec 2>&1 # redirect stderr to stdout to catch all output to log destination for MM in $BTRFS_BALANCE_MOUNTPOINTS; do IFS="$OIFS" - if [ $(stat -f --format=%T "$MM") != "btrfs" ]; then + if ! is_btrfs "$MM"; then echo "Path $MM is not btrfs, skipping" continue fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.4/btrfs-defrag-plugin.py new/btrfsmaintenance-0.4.1/btrfs-defrag-plugin.py --- old/btrfsmaintenance-0.4/btrfs-defrag-plugin.py 2018-01-15 17:40:06.381987125 +0100 +++ new/btrfsmaintenance-0.4.1/btrfs-defrag-plugin.py 2018-03-15 18:49:36.409244400 +0100 @@ -3,28 +3,33 @@ # This plugin defragments rpm files after update. # # If the filesystem is btrfs, run defrag command in the RPM database -# folder, set the desired extent size to 64MiB, but this may change in the +# folder, set the desired extent size to 32MiB, but this may change in the # result depending on the fragmentation of the free space. # -# Why 64MB: +# Why 32MiB: # - the worst fragmentation has been observed on Packages # - this can grow up to several hundred of megabytes # - the file gets updated at random places -# - although the file will be composed of several extents, it's faster to +# - although the file will be composed of many extents, it's
commit btrfsmaintenance for openSUSE:Factory
Hello community, here is the log from the commit of package btrfsmaintenance for openSUSE:Factory checked in at 2018-03-13 10:24:37 Comparing /work/SRC/openSUSE:Factory/btrfsmaintenance (Old) and /work/SRC/openSUSE:Factory/.btrfsmaintenance.new (New) Package is "btrfsmaintenance" Tue Mar 13 10:24:37 2018 rev:16 rq:586017 version:0.4 Changes: --- /work/SRC/openSUSE:Factory/btrfsmaintenance/btrfsmaintenance.changes 2018-02-27 17:00:29.638543994 +0100 +++ /work/SRC/openSUSE:Factory/.btrfsmaintenance.new/btrfsmaintenance.changes 2018-03-13 10:24:41.756357201 +0100 @@ -1,0 +2,6 @@ +Mon Mar 12 13:39:23 CET 2018 - ku...@suse.de + +- Add missing btrfsmaintenance-refresh.path [bsc#1084871] +- Use %license [bsc#1082318] + +--- Other differences: -- ++ btrfsmaintenance.spec ++ --- /var/tmp/diff_new_pack.7Cno1T/_old 2018-03-13 10:24:42.856317790 +0100 +++ /var/tmp/diff_new_pack.7Cno1T/_new 2018-03-13 10:24:42.860317648 +0100 @@ -25,7 +25,7 @@ Version:0.4 Release:0 Summary:Scripts for btrfs periodic maintenance tasks -License:GPL-2.0 +License:GPL-2.0-only Group: System/Base Url:https://github.com/kdave/btrfsmaintenance Source0:%{name}-%{version}.tar.bz2 @@ -61,6 +61,7 @@ # systemd services and timers install -m 755 -d %{buildroot}%{_unitdir} install -m 644 -D btrfsmaintenance-refresh.service %{buildroot}%{_unitdir} +install -m 644 -D btrfsmaintenance-refresh.path %{buildroot}%{_unitdir} install -m 644 -D btrfs-balance.service %{buildroot}%{_unitdir} install -m 644 -D btrfs-defrag.service %{buildroot}%{_unitdir} install -m 644 -D btrfs-scrub.service %{buildroot}%{_unitdir} @@ -84,20 +85,21 @@ # if the new service files don't exist, we migrate from # old version with old script, remove cron symlinks [ ! -f %{_unitdir}/btrfs-balance.timer -a -f %{_datadir}/%{name}/btrfsmaintenance-refresh-cron.sh ] && %{_datadir}/%{name}/btrfsmaintenance-refresh-cron.sh uninstall -%service_add_pre btrfsmaintenance-refresh.service btrfs-balance.service btrfs-balance.timer btrfs-defrag.service btrfs-defrag.timer btrfs-scrub.service btrfs-scrub.timer btrfs-trim.service btrfs-trim.timer +%service_add_pre btrfsmaintenance-refresh.service btrfsmaintenance-refresh.path btrfs-balance.service btrfs-balance.timer btrfs-defrag.service btrfs-defrag.timer btrfs-scrub.service btrfs-scrub.timer btrfs-trim.service btrfs-trim.timer %post -%service_add_post btrfsmaintenance-refresh.service btrfs-balance.service btrfs-balance.timer btrfs-defrag.service btrfs-defrag.timer btrfs-scrub.service btrfs-scrub.timer btrfs-trim.service btrfs-trim.timer +%service_add_post btrfsmaintenance-refresh.service btrfsmaintenance-refresh.path btrfs-balance.service btrfs-balance.timer btrfs-defrag.service btrfs-defrag.timer btrfs-scrub.service btrfs-scrub.timer btrfs-trim.service btrfs-trim.timer %{fillup_only btrfsmaintenance} %preun -%service_del_preun btrfsmaintenance-refresh.service btrfs-balance.service btrfs-balance.timer btrfs-defrag.service btrfs-defrag.timer btrfs-scrub.service btrfs-scrub.timer btrfs-trim.service btrfs-trim.timer +%service_del_preun btrfsmaintenance-refresh.service btrfsmaintenance-refresh.path btrfs-balance.service btrfs-balance.timer btrfs-defrag.service btrfs-defrag.timer btrfs-scrub.service btrfs-scrub.timer btrfs-trim.service btrfs-trim.timer %postun -%service_del_postun btrfsmaintenance-refresh.service btrfs-balance.service btrfs-balance.timer btrfs-defrag.service btrfs-defrag.timer btrfs-scrub.service btrfs-scrub.timer btrfs-trim.service btrfs-trim.timer +%service_del_postun btrfsmaintenance-refresh.service btrfsmaintenance-refresh.path btrfs-balance.service btrfs-balance.timer btrfs-defrag.service btrfs-defrag.timer btrfs-scrub.service btrfs-scrub.timer btrfs-trim.service btrfs-trim.timer %files -%doc COPYING README.md +%license COPYING +%doc README.md %{_fillupdir}/sysconfig.btrfsmaintenance %dir %{_datadir}/%{name} %{_datadir}/%{name}/* @@ -105,6 +107,7 @@ %dir %{_libexecdir}/zypp/plugins %dir %{_libexecdir}/zypp/plugins/commit %{_libexecdir}/zypp/plugins/commit/btrfs-defrag-plugin.py +%{_unitdir}/btrfsmaintenance-refresh.path %{_unitdir}/btrfsmaintenance-refresh.service %{_unitdir}/btrfs-balance.service %{_unitdir}/btrfs-defrag.service
commit btrfsmaintenance for openSUSE:Factory
Hello community, here is the log from the commit of package btrfsmaintenance for openSUSE:Factory checked in at 2018-02-27 17:00:10 Comparing /work/SRC/openSUSE:Factory/btrfsmaintenance (Old) and /work/SRC/openSUSE:Factory/.btrfsmaintenance.new (New) Package is "btrfsmaintenance" Tue Feb 27 17:00:10 2018 rev:15 rq:580565 version:0.4 Changes: --- /work/SRC/openSUSE:Factory/btrfsmaintenance/btrfsmaintenance.changes 2018-01-20 11:28:15.560032082 +0100 +++ /work/SRC/openSUSE:Factory/.btrfsmaintenance.new/btrfsmaintenance.changes 2018-02-27 17:00:29.638543994 +0100 @@ -1,0 +2,6 @@ +Mon Feb 5 15:13:00 UTC 2018 - lpecha...@suse.com + +- Move the defrag plugin over to Python 3. (bsc#1070322) +- Added patch: python3-support-bsc1070322.diff + +--- New: python3-support-bsc1070322.diff Other differences: -- ++ btrfsmaintenance.spec ++ --- /var/tmp/diff_new_pack.dYyCIl/_old 2018-02-27 17:00:30.870499481 +0100 +++ /var/tmp/diff_new_pack.dYyCIl/_new 2018-02-27 17:00:30.874499337 +0100 @@ -29,9 +29,10 @@ Group: System/Base Url:https://github.com/kdave/btrfsmaintenance Source0:%{name}-%{version}.tar.bz2 +Patch0: python3-support-bsc1070322.diff BuildRequires: systemd Requires: btrfsprogs -Requires: zypp-plugin-python +Requires: python3-zypp-plugin Requires: libzypp(plugin:commit) Supplements:btrfsprogs BuildArch: noarch @@ -43,6 +44,7 @@ %prep %setup -q +%patch0 -p1 %build ++ python3-support-bsc1070322.diff ++ Index: btrfsmaintenance-0.4/btrfs-defrag-plugin.py === --- btrfsmaintenance-0.4.orig/btrfs-defrag-plugin.py +++ btrfsmaintenance-0.4/btrfs-defrag-plugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # This plugin defragments rpm files after update. # @@ -17,14 +17,19 @@ # contiguous space, the bigger the extent is, the worse and the extent # size hint is not reached anyway -from sys import stderr +import sys +if sys.version_info[0] >= 3: +from builtins import str +popen_kwargs = { 'encoding': 'ascii' } +else: +popen_kwargs = { } from zypp_plugin import Plugin import subprocess DEBUG=False EXTENT_SIZE=64*1024*1024 LOGFILE='/tmp/btrfs-defrag-plugin.log' -PATH=subprocess.check_output(["rpm", "--eval", "%_dbpath"]).strip() +PATH=subprocess.check_output(["rpm", "--eval", "%_dbpath"], **popen_kwargs).strip() def dbg(args): if not DEBUG: return @@ -34,7 +39,7 @@ def dbg(args): f.close() def qx(args): -out=subprocess.Popen(args, shell=True, stdout=subprocess.PIPE).stdout +out=subprocess.Popen(args, shell=True, stdout=subprocess.PIPE, **popen_kwargs).stdout outstr="".join(out.readlines()) out.close() return outstr
commit btrfsmaintenance for openSUSE:Factory
Hello community, here is the log from the commit of package btrfsmaintenance for openSUSE:Factory checked in at 2017-12-22 12:20:58 Comparing /work/SRC/openSUSE:Factory/btrfsmaintenance (Old) and /work/SRC/openSUSE:Factory/.btrfsmaintenance.new (New) Package is "btrfsmaintenance" Fri Dec 22 12:20:58 2017 rev:13 rq:559129 version:0.3.1 Changes: --- /work/SRC/openSUSE:Factory/btrfsmaintenance/btrfsmaintenance.changes 2017-12-14 11:00:55.917625730 +0100 +++ /work/SRC/openSUSE:Factory/.btrfsmaintenance.new/btrfsmaintenance.changes 2017-12-22 12:21:33.447842581 +0100 @@ -1,0 +2,6 @@ +Sun Dec 17 12:18:45 CET 2017 - ku...@suse.de + +- Switch default of btrfsmaintenance-refresh.service to systemd-timer, + too (btrfsmaintenance-switch-to-timer.patch) [bsc#1073204] + +--- New: btrfsmaintenance-switch-to-timer.patch Other differences: -- ++ btrfsmaintenance.spec ++ --- /var/tmp/diff_new_pack.ggUi0N/_old 2017-12-22 12:21:34.183806696 +0100 +++ /var/tmp/diff_new_pack.ggUi0N/_new 2017-12-22 12:21:34.187806501 +0100 @@ -23,7 +23,7 @@ Name: btrfsmaintenance Version:0.3.1 -Release:10.2 +Release:0 Summary:Scripts for btrfs periodic maintenance tasks License:GPL-2.0 Group: System/Base @@ -32,6 +32,7 @@ # PATCH-FIX-OPENSUSE btrfsmaintenance-0.3.1-fix-rpm-db-path.patch -- Fix RPM database path for Tumbleweed Patch0: btrfsmaintenance-0.3.1-fix-rpm-db-path.patch Patch1: pull-request-36.patch +Patch2: btrfsmaintenance-switch-to-timer.patch Requires: zypp-plugin-python Requires: libzypp(plugin:commit) #Recommends: cron @@ -54,6 +55,7 @@ %patch0 %endif %patch1 -p1 +%patch2 -p0 %build ++ btrfsmaintenance-switch-to-timer.patch ++ --- btrfsmaintenance-refresh-cron.sh +++ btrfsmaintenance-refresh-cron.sh2017/12/17 11:12:22 @@ -91,6 +91,10 @@ case "$BTRFS_TIMER_IMPLEMENTATION" in systemd-timer) +# Deinstall cron jobs, don't run it twice. +for SCRIPT in btrfs-scrub btrfs-defrag btrfs-balance btrfs-trim; do + refresh_cron uninstall ${SCRIPT}.sh +done refresh_timer "$BTRFS_SCRUB_PERIOD" btrfs-scrub refresh_timer "$BTRFS_DEFRAG_PERIOD" btrfs-defrag refresh_timer "$BTRFS_BALANCE_PERIOD" btrfs-balance --- btrfsmaintenance-refresh.service +++ btrfsmaintenance-refresh.service2017/12/17 11:04:07 @@ -3,7 +3,7 @@ After=local-fs.target [Service] -ExecStart=/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh +ExecStart=/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer Type=oneshot [Install]
commit btrfsmaintenance for openSUSE:Factory
Hello community, here is the log from the commit of package btrfsmaintenance for openSUSE:Factory checked in at 2017-11-24 10:55:51 Comparing /work/SRC/openSUSE:Factory/btrfsmaintenance (Old) and /work/SRC/openSUSE:Factory/.btrfsmaintenance.new (New) Package is "btrfsmaintenance" Fri Nov 24 10:55:51 2017 rev:11 rq:544913 version:0.3.1 Changes: --- /work/SRC/openSUSE:Factory/btrfsmaintenance/btrfsmaintenance.changes 2017-11-13 14:09:47.737814881 +0100 +++ /work/SRC/openSUSE:Factory/.btrfsmaintenance.new/btrfsmaintenance.changes 2017-11-24 10:55:53.849157949 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 13:44:40 UTC 2017 - rbr...@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +--- Other differences: -- ++ btrfsmaintenance.spec ++ --- /var/tmp/diff_new_pack.XwUnhr/_old 2017-11-24 10:55:54.713126395 +0100 +++ /var/tmp/diff_new_pack.XwUnhr/_new 2017-11-24 10:55:54.717126248 +0100 @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: btrfsmaintenance Version:0.3.1 Release:0 @@ -78,8 +83,8 @@ install -m 755 -d %{buildroot}/usr/lib/zypp/plugins/commit install -m 755 -D btrfs-defrag-plugin.py %{buildroot}/usr/lib/zypp/plugins/commit -install -m 755 -d %{buildroot}%{_localstatedir}/adm/fillup-templates -install -m 644 -D sysconfig.btrfsmaintenance %{buildroot}%{_localstatedir}/adm/fillup-templates +install -m 755 -d %{buildroot}%{_fillupdir} +install -m 644 -D sysconfig.btrfsmaintenance %{buildroot}%{_fillupdir} %post %{fillup_only btrfsmaintenance} @@ -117,7 +122,7 @@ %files %defattr(-,root,root) %doc COPYING README.md -%{_localstatedir}/adm/fillup-templates/sysconfig.btrfsmaintenance +%{_fillupdir}/sysconfig.btrfsmaintenance %dir %{_datadir}/%{name} %{_datadir}/%{name}/* %dir /usr/lib/zypp/
commit btrfsmaintenance for openSUSE:Factory
Hello community, here is the log from the commit of package btrfsmaintenance for openSUSE:Factory checked in at 2017-11-13 14:09:39 Comparing /work/SRC/openSUSE:Factory/btrfsmaintenance (Old) and /work/SRC/openSUSE:Factory/.btrfsmaintenance.new (New) Package is "btrfsmaintenance" Mon Nov 13 14:09:39 2017 rev:10 rq:541222 version:0.3.1 Changes: --- /work/SRC/openSUSE:Factory/btrfsmaintenance/btrfsmaintenance.changes 2017-11-08 15:16:00.773171149 +0100 +++ /work/SRC/openSUSE:Factory/.btrfsmaintenance.new/btrfsmaintenance.changes 2017-11-13 14:09:47.737814881 +0100 @@ -1,0 +2,10 @@ +Fri Nov 10 22:12:08 UTC 2017 - antoine.belv...@opensuse.org + +- Fix cron symlinks removal upon package upgrade (boo#904518): + * The problem was in the preun section (in the old RPM). + * This means the symlinks are removed by this update, but won't +be by the next ones. + * Please run 'systemctl start btrfsmaintenance-refresh' one more +time to fix your symlinks. + +--- Other differences: -- ++ btrfsmaintenance.spec ++ --- /var/tmp/diff_new_pack.ZW86p9/_old 2017-11-13 14:09:49.145764215 +0100 +++ /var/tmp/diff_new_pack.ZW86p9/_new 2017-11-13 14:09:49.149764071 +0100 @@ -95,7 +95,12 @@ %preun %service_del_preun btrfsmaintenance-refresh.service -%{_datadir}/%{name}/btrfsmaintenance-refresh-cron.sh uninstall +if [ $1 -eq 0 ]; then + # Remove cron files in %%preun only if it's a package removal. + # If it's an upgrade, the %%post section of the new package has + # already refreshed the cron links, so we shall not remove them. + %{_datadir}/%{name}/btrfsmaintenance-refresh-cron.sh uninstall +fi %postun %service_del_postun btrfsmaintenance-refresh.service @@ -104,7 +109,9 @@ %if 0%{?suse_version} < 1210 %preun -%{_datadir}/%{name}/btrfsmaintenance-refresh-cron.sh uninstall +if [ $1 -eq 0 ]; then + %{_datadir}/%{name}/btrfsmaintenance-refresh-cron.sh uninstall +fi %endif %files
commit btrfsmaintenance for openSUSE:Factory
Hello community, here is the log from the commit of package btrfsmaintenance for openSUSE:Factory checked in at 2017-11-08 15:12:03 Comparing /work/SRC/openSUSE:Factory/btrfsmaintenance (Old) and /work/SRC/openSUSE:Factory/.btrfsmaintenance.new (New) Package is "btrfsmaintenance" Wed Nov 8 15:12:03 2017 rev:9 rq:539865 version:0.3.1 Changes: --- /work/SRC/openSUSE:Factory/btrfsmaintenance/btrfsmaintenance.changes 2017-07-07 10:16:48.527925430 +0200 +++ /work/SRC/openSUSE:Factory/.btrfsmaintenance.new/btrfsmaintenance.changes 2017-11-08 15:16:00.773171149 +0100 @@ -1,0 +2,7 @@ +Tue Nov 7 22:06:55 UTC 2017 - antoine.belv...@opensuse.org + +- Add btrfsmaintenance-0.3.1-fix-rpm-db-path.patch: + * Change RPM database path to /usr/lib/sysimage/rpm for +Tumbleweed. + +--- New: btrfsmaintenance-0.3.1-fix-rpm-db-path.patch Other differences: -- ++ btrfsmaintenance.spec ++ --- /var/tmp/diff_new_pack.OUF6Io/_old 2017-11-08 15:16:01.177156403 +0100 +++ /var/tmp/diff_new_pack.OUF6Io/_new 2017-11-08 15:16:01.177156403 +0100 @@ -24,6 +24,8 @@ Group: System/Base Url:https://github.com/kdave/btrfsmaintenance Source0:%{name}-%{version}.tar.bz2 +# PATCH-FIX-OPENSUSE btrfsmaintenance-0.3.1-fix-rpm-db-path.patch -- Fix RPM database path for Tumbleweed +Patch0: btrfsmaintenance-0.3.1-fix-rpm-db-path.patch Requires: zypp-plugin-python Requires: libzypp(plugin:commit) Recommends: cron @@ -42,6 +44,9 @@ %prep %setup -q +%if 0%{?suse_version} > 1320 +%patch0 +%endif %build ++ btrfsmaintenance-0.3.1-fix-rpm-db-path.patch ++ RPM database location has changed from /var/lib/rpm to /usr/lib/sysimage/rpm for openSUSE Tumbleweed. See https://lists.opensuse.org/opensuse-factory/2017-11/msg00188.html. --- diff -up ./btrfs-defrag-plugin.py.orig ./btrfs-defrag-plugin.py --- ./btrfs-defrag-plugin.py.orig 2017-11-07 22:56:51.559813001 +0100 +++ ./btrfs-defrag-plugin.py2017-11-07 22:57:38.027814927 +0100 @@ -24,7 +24,7 @@ import subprocess DEBUG=False EXTENT_SIZE=64*1024*1024 LOGFILE='/tmp/btrfs-defrag-plugin.log' -PATH='/var/lib/rpm' +PATH='/usr/lib/sysimage/rpm/' def dbg(args): if not DEBUG: return
commit btrfsmaintenance for openSUSE:Factory
Hello community, here is the log from the commit of package btrfsmaintenance for openSUSE:Factory checked in at 2017-07-07 10:16:47 Comparing /work/SRC/openSUSE:Factory/btrfsmaintenance (Old) and /work/SRC/openSUSE:Factory/.btrfsmaintenance.new (New) Package is "btrfsmaintenance" Fri Jul 7 10:16:47 2017 rev:8 rq:508324 version:0.3.1 Changes: --- /work/SRC/openSUSE:Factory/btrfsmaintenance/btrfsmaintenance.changes 2017-04-11 09:46:47.403292020 +0200 +++ /work/SRC/openSUSE:Factory/.btrfsmaintenance.new/btrfsmaintenance.changes 2017-07-07 10:16:48.527925430 +0200 @@ -1,0 +2,5 @@ +Wed Jul 5 09:17:36 UTC 2017 - lnus...@suse.de + +- Require btrfsprogs (bsc#1047226) + +--- Other differences: -- ++ btrfsmaintenance.spec ++ --- /var/tmp/diff_new_pack.9bJAyw/_old 2017-07-07 10:16:49.407800932 +0200 +++ /var/tmp/diff_new_pack.9bJAyw/_new 2017-07-07 10:16:49.411800366 +0200 @@ -28,6 +28,7 @@ Requires: libzypp(plugin:commit) Recommends: cron Supplements:btrfsprogs +Requires: btrfsprogs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %{?systemd_requires}
commit btrfsmaintenance for openSUSE:Factory
Hello community, here is the log from the commit of package btrfsmaintenance for openSUSE:Factory checked in at 2017-04-11 09:46:45 Comparing /work/SRC/openSUSE:Factory/btrfsmaintenance (Old) and /work/SRC/openSUSE:Factory/.btrfsmaintenance.new (New) Package is "btrfsmaintenance" Tue Apr 11 09:46:45 2017 rev:7 rq:486446 version:0.3.1 Changes: --- /work/SRC/openSUSE:Factory/btrfsmaintenance/btrfsmaintenance.changes 2016-03-16 10:38:43.0 +0100 +++ /work/SRC/openSUSE:Factory/.btrfsmaintenance.new/btrfsmaintenance.changes 2017-04-11 09:46:47.403292020 +0200 @@ -1,0 +2,22 @@ +Fri Apr 7 00:00:00 CEST 2017 - dste...@suse.cz + +- version 0.3.1 + - dist-install: fix installation paths, install functions + - functions: fix syntax to be compatible with dash + - spec: install functions file + +--- +Tue Nov 15 00:00:00 CET 2016 - dste...@suse.cz + +- version 0.3 + - add syslog to logging targets + - add none target (/dev/null) + - autodetect btrfs filesystems for balance, scrub and trim + - detect mixed blockgroups and use correct balance filters + - fix uninstall rules + - fix capturing entire output to the log + - fix when cron files are symlinks + - add generic installation script + - doc updates: retention policy tuning + +--- Old: btrfsmaintenance-0.2.tar.bz2 New: btrfsmaintenance-0.3.1.tar.bz2 Other differences: -- ++ btrfsmaintenance.spec ++ --- /var/tmp/diff_new_pack.8UaTwv/_old 2017-04-11 09:46:47.979210664 +0200 +++ /var/tmp/diff_new_pack.8UaTwv/_new 2017-04-11 09:46:47.983210099 +0200 @@ -1,7 +1,7 @@ # # spec file for package btrfsmaintenance # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: btrfsmaintenance -Version:0.2 +Version:0.3.1 Release:0 Summary:Scripts for btrfs periodic maintenance tasks License:GPL-2.0 @@ -56,6 +56,7 @@ install -m 755 btrfs-scrub.sh %{buildroot}%{_datadir}/%{name} install -m 755 btrfs-trim.sh %{buildroot}%{_datadir}/%{name} install -m 755 btrfsmaintenance-refresh-cron.sh %{buildroot}%{_datadir}/%{name} +install -m 644 btrfsmaintenance-functions %{buildroot}%{_datadir}/%{name} %if 0%{?suse_version} >= 1210 install -m 755 -d %{buildroot}%{_unitdir} ++ btrfsmaintenance-0.2.tar.bz2 -> btrfsmaintenance-0.3.1.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.2/README.md new/btrfsmaintenance-0.3.1/README.md --- old/btrfsmaintenance-0.2/README.md 2016-03-04 18:03:27.0 +0100 +++ new/btrfsmaintenance-0.3.1/README.md2017-04-07 14:41:46.299279436 +0200 @@ -146,6 +146,11 @@ ### Installation ### +For debian based systems, run `debian-install.sh` as root. + +For non-debian based systems, check for distro provided package or +do manual installation of files as described below. + * `btrfs-*.sh` task scripts are expected at `/usr/share/btrfsmaintenance` * `sysconfig.btrfsmaintenance` configuration template is put to: * `/etc/sysconfig/btrfsmaintenance` on SUSE and RedHat based systems or derivatives @@ -157,7 +162,7 @@ ### cron jobs ### The periodic execution of the tasks is done by the 'cron' service. Symlinks to -th task scripts are located in the respective directories in +the task scripts are located in the respective directories in `/etc/cron.`. The script `btrfsmaintenance-refresh-cron.sh` will synchronize the symlinks @@ -185,6 +190,170 @@ values and can be deployed without changes (expecting the root filesystem to be btrfs). +## Tuning periodic snapshotting ## + +There are various tools and handwritten scripts to manage periodic snapshots +and cleaning. The common problem is tuning the retention policy constrained by +the filesystem size and not running out of space. + +This section will describe factors that affect that, using [snapper](https://snapper.io) +as an example, but adapting to other tools should be straightforward. + +### Intro ### + +Snapper is a tool to manage snapshots of btrfs subvolumes. It can create +snapshots of given subvolume manually, periodically or in a pre/post way for +a given command. It can be configured to retain existing snapshots according +to time-based settings. As the retention policy can be very different for +various usecases, we need to be able to find matching settings. + +The
commit btrfsmaintenance for openSUSE:Factory
Hello community, here is the log from the commit of package btrfsmaintenance for openSUSE:Factory checked in at 2015-10-17 16:39:06 Comparing /work/SRC/openSUSE:Factory/btrfsmaintenance (Old) and /work/SRC/openSUSE:Factory/.btrfsmaintenance.new (New) Package is "btrfsmaintenance" Changes: --- /work/SRC/openSUSE:Factory/btrfsmaintenance/btrfsmaintenance.changes 2015-07-14 17:46:20.0 +0200 +++ /work/SRC/openSUSE:Factory/.btrfsmaintenance.new/btrfsmaintenance.changes 2015-10-17 16:39:07.0 +0200 @@ -1,0 +2,7 @@ +Thu Oct 8 00:00:00 CEST 2015 - dste...@suse.cz + +- version 0.1.2 + - change default config for trim: off + - journal loggin should work (fixed a typo) + +--- Old: btrfsmaintenance-0.1.1.tar.bz2 New: btrfsmaintenance-0.1.2.tar.bz2 Other differences: -- ++ btrfsmaintenance.spec ++ --- /var/tmp/diff_new_pack.j5JSJY/_old 2015-10-17 16:39:07.0 +0200 +++ /var/tmp/diff_new_pack.j5JSJY/_new 2015-10-17 16:39:07.0 +0200 @@ -17,7 +17,7 @@ Name: btrfsmaintenance -Version:0.1.1 +Version:0.1.2 Release:0 Summary:Scripts for btrfs periodic maintenance tasks License:GPL-2.0 ++ btrfsmaintenance-0.1.1.tar.bz2 -> btrfsmaintenance-0.1.2.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.1.1/README.md new/btrfsmaintenance-0.1.2/README.md --- old/btrfsmaintenance-0.1.1/README.md2015-07-13 15:15:06.0 +0200 +++ new/btrfsmaintenance-0.1.2/README.md2015-10-14 17:39:46.0 +0200 @@ -1,40 +1,139 @@ Btrfs maintenance toolbox = -This is a set of scripts supplements the btrfs filesystem and aims to automate -a few maintenance tasks. This means the scrub, balance, trim or -defragmentation. +This is a set of scripts supplementing the btrfs filesystem and aims to automate +a few maintenance tasks. This means the *scrub*, *balance*, *trim* or +*defragmentation*. Each of the tasks can be turned on/off and configured independently. The default config values were selected to fit the default installation profile of -openSUSE 13.2. +openSUSE 13.2 where the root filesystem is formatted to *btrfs*. -* scrub - go through all medatada/data and verify the checksums +Overall tuning of the default values should give a good balance between effects +of the tasks and low impact of other work on the system. If this does not fit +your needs, please adjust the settings. -* balance - the balance command can do a lot of things, in general moves data around in big chunks, here we use it to reclaim back the space of the underused chunks so it can be allocated again according to current needs +### scrub ### + +__Description:__ Scrub operation reads all data and metadata from the devices +and verifies the checksums. It's not mandatory, but may point out problems with +faulty hardware early as it touches data that might not be in use and bitrot. + +If thre's a redundancy of data/metadata, ie. the *DUP* or *RAID1/5/6* profiles, scrub +is able to repair the data autmatically if there's a good copy available. + +__Impact when active:__ Intense read operations take place and may slow down or +block other filesystem activies, possibly only for short periods. + +__Tuning:__ + +* the recommended period is once in a month but a weekly period is also acceptable +* you can turn off the automatic repair (`BTRFS_SCRUB_READ_ONLY`) +* the default IO priority is set to *idle* but scrub may take long to finish, + you can change priority to *normal* (`BTRFS_SCRUB_PRIORITY`) + +__Related commands:__ + +* you can check status of last scrub run (either manual or through the cron + job) by `btrfs scrub status /path` +* you can cancel a running scrub anytime if you find it inconvenient (`btrfs + scrub cancel /path`), the progress state is saved each 5 seconds and next + time scrub will start from that point + +### balance ### + +__Description:__ The balance command can do a lot of things, in general moves +data around in big chunks. Here we use it to reclaim back the space of the +underused chunks so it can be allocated again according to current needs. The point is to prevent some corner cases where it's not possible to eg. allocate new metadata chunks because the whole device space is reserved for all the chunks, although the total space occupied is smaller and the allocation should succeed. -* trim - run TRIM on the filesystem using the 'fstrim' utility, makes sense for SSD devices +The balance operation needs enough workspace so it can shuffle data around. By +workspace
commit btrfsmaintenance for openSUSE:Factory
Hello community, here is the log from the commit of package btrfsmaintenance for openSUSE:Factory checked in at 2015-07-14 17:45:03 Comparing /work/SRC/openSUSE:Factory/btrfsmaintenance (Old) and /work/SRC/openSUSE:Factory/.btrfsmaintenance.new (New) Package is btrfsmaintenance Changes: --- /work/SRC/openSUSE:Factory/btrfsmaintenance/btrfsmaintenance.changes 2014-11-20 18:43:26.0 +0100 +++ /work/SRC/openSUSE:Factory/.btrfsmaintenance.new/btrfsmaintenance.changes 2015-07-14 17:46:20.0 +0200 @@ -1,0 +2,6 @@ +Mon Jul 13 00:00:00 CEST 2015 - dste...@suse.com + +- version 0.1.1 + - fix typo and make journal logging target work + +--- Old: btrfsmaintenance-0.1.tar.bz2 New: btrfsmaintenance-0.1.1.tar.bz2 Other differences: -- ++ btrfsmaintenance.spec ++ --- /var/tmp/diff_new_pack.YxpQld/_old 2015-07-14 17:46:21.0 +0200 +++ /var/tmp/diff_new_pack.YxpQld/_new 2015-07-14 17:46:21.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package btrfsmaintenance # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: btrfsmaintenance -Version:0.1 +Version:0.1.1 Release:0 Summary:Scripts for btrfs periodic maintenance tasks License:GPL-2.0 ++ btrfsmaintenance-0.1.tar.bz2 - btrfsmaintenance-0.1.1.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.1/btrfs-balance.sh new/btrfsmaintenance-0.1.1/btrfs-balance.sh --- old/btrfsmaintenance-0.1/btrfs-balance.sh 2014-11-19 17:36:09.0 +0100 +++ new/btrfsmaintenance-0.1.1/btrfs-balance.sh 2015-07-13 15:15:06.0 +0200 @@ -47,7 +47,7 @@ } | \ case $BTRFS_LOG_OUTPUT in stdout) cat;; - jounral) sytemd-cat -t $LOGIDENTIFIER;; + journal) sytemd-cat -t $LOGIDENTIFIER;; *) cat;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.1/btrfs-defrag.sh new/btrfsmaintenance-0.1.1/btrfs-defrag.sh --- old/btrfsmaintenance-0.1/btrfs-defrag.sh2014-11-19 17:36:09.0 +0100 +++ new/btrfsmaintenance-0.1.1/btrfs-defrag.sh 2015-07-13 15:15:06.0 +0200 @@ -33,7 +33,7 @@ } | \ case $BTRFS_LOG_OUTPUT in stdout) cat;; - jounral) sytemd-cat -t $LOGIDENTIFIER;; + journal) sytemd-cat -t $LOGIDENTIFIER;; *) cat;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.1/btrfs-scrub.sh new/btrfsmaintenance-0.1.1/btrfs-scrub.sh --- old/btrfsmaintenance-0.1/btrfs-scrub.sh 2014-11-19 17:36:09.0 +0100 +++ new/btrfsmaintenance-0.1.1/btrfs-scrub.sh 2015-07-13 15:15:06.0 +0200 @@ -48,7 +48,7 @@ } | \ case $BTRFS_LOG_OUTPUT in stdout) cat;; - jounral) sytemd-cat -t $LOGIDENTIFIER;; + journal) sytemd-cat -t $LOGIDENTIFIER;; *) cat;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btrfsmaintenance-0.1/btrfs-trim.sh new/btrfsmaintenance-0.1.1/btrfs-trim.sh --- old/btrfsmaintenance-0.1/btrfs-trim.sh 2014-11-19 17:36:09.0 +0100 +++ new/btrfsmaintenance-0.1.1/btrfs-trim.sh2015-07-13 15:15:06.0 +0200 @@ -33,7 +33,7 @@ } | \ case $BTRFS_LOG_OUTPUT in stdout) cat;; - jounral) sytemd-cat -t $LOGIDENTIFIER;; + journal) sytemd-cat -t $LOGIDENTIFIER;; *) cat;; esac
commit btrfsmaintenance for openSUSE:Factory
Hello community, here is the log from the commit of package btrfsmaintenance for openSUSE:Factory checked in at 2014-11-06 16:50:36 Comparing /work/SRC/openSUSE:Factory/btrfsmaintenance (Old) and /work/SRC/openSUSE:Factory/.btrfsmaintenance.new (New) Package is btrfsmaintenance Changes: --- /work/SRC/openSUSE:Factory/btrfsmaintenance/btrfsmaintenance.changes 2014-10-14 07:10:32.0 +0200 +++ /work/SRC/openSUSE:Factory/.btrfsmaintenance.new/btrfsmaintenance.changes 2014-11-06 16:51:46.0 +0100 @@ -1,0 +2,12 @@ +Wed Oct 29 00:00:00 CET 2014 - dste...@suse.cz + +- add COPYING, README.md +- add config option to specify log target (stdout, or journal) + +--- +Thu Oct 9 18:33:44 CEST 2014 - dste...@suse.cz + +- clean spec +- add Url tag + +--- Other differences: -- ++ btrfsmaintenance.spec ++ --- /var/tmp/diff_new_pack.FvoJ1C/_old 2014-11-06 16:51:46.0 +0100 +++ /var/tmp/diff_new_pack.FvoJ1C/_new 2014-11-06 16:51:46.0 +0100 @@ -22,20 +22,21 @@ Summary:Scripts for btrfs periodic maintenance tasks License:GPL-2.0 Group: System/Base +Url:https://github.com/kdave/btrfsmaintenance Source0:%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -Recommends: cron Requires: zypp-plugin-python Requires: libzypp(plugin:commit) +Recommends: cron +Supplements:btrfsprogs +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +%{?systemd_requires} %if 0%{?suse_version} = 1210 BuildRequires: systemd %endif -%{?systemd_requires} -Supplements:btrfsprogs %description -Scripts for btrfs maintenance taks like periodic scrub, balance, trim or defrag +Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag on selected mountpoints or directories. %prep @@ -49,22 +50,22 @@ mkdir -p %{buildroot}%{_sysconfdir}/cron.weekly/ mkdir -p %{buildroot}%{_sysconfdir}/cron.monthly/ -install -m 755 -d %{buildroot}/usr/share/%{name} -install -m 755 btrfs-defrag.sh %{buildroot}/usr/share/%{name} -install -m 755 btrfs-balance.sh %{buildroot}/usr/share/%{name} -install -m 755 btrfs-scrub.sh %{buildroot}/usr/share/%{name} -install -m 755 btrfs-trim.sh %{buildroot}/usr/share/%{name} -install -m 755 btrfsmaintenance-refresh-cron.sh %{buildroot}/usr/share/%{name} +install -m 755 -d %{buildroot}%{_datadir}/%{name} +install -m 755 btrfs-defrag.sh %{buildroot}%{_datadir}/%{name} +install -m 755 btrfs-balance.sh %{buildroot}%{_datadir}/%{name} +install -m 755 btrfs-scrub.sh %{buildroot}%{_datadir}/%{name} +install -m 755 btrfs-trim.sh %{buildroot}%{_datadir}/%{name} +install -m 755 btrfsmaintenance-refresh-cron.sh %{buildroot}%{_datadir}/%{name} %if 0%{?suse_version} = 1210 install -m 755 -d %{buildroot}%{_unitdir} install -m 644 -D btrfsmaintenance-refresh.service %{buildroot}%{_unitdir} install -m 755 -d %{buildroot}%{_sbindir} -ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcbtrfsmaintenance-refresh +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcbtrfsmaintenance-refresh %else # just a hack, but sufficient -install -m 755 -d %{buildroot}/etc/cron.hourly -ln -s /usr/share/%{name}/btrfsmaintenance-refresh-cron.sh %{buildroot}/etc/cron.hourly/ +install -m 755 -d %{buildroot}%{_sysconfdir}/cron.hourly +ln -s %{_datadir}/%{name}/btrfsmaintenance-refresh-cron.sh %{buildroot}%{_sysconfdir}/cron.hourly/ %endif install -m 755 -d %{buildroot}/usr/lib/zypp/plugins/commit @@ -80,27 +81,30 @@ %endif %if 0%{?suse_version} = 1210 + %pre %service_add_pre btrfsmaintenance-refresh.service %preun %service_del_preun btrfsmaintenance-refresh.service -/usr/share/%{name}/btrfsmaintenance-refresh-cron.sh uninstall +%{_datadir}/%{name}/btrfsmaintenance-refresh-cron.sh uninstall %postun %service_del_postun btrfsmaintenance-refresh.service %endif %if 0%{?suse_version} 1210 + %preun -/usr/share/%{name}/btrfsmaintenance-refresh-cron.sh uninstall +%{_datadir}/%{name}/btrfsmaintenance-refresh-cron.sh uninstall %endif %files %defattr(-,root,root) +%doc COPYING README.md %{_localstatedir}/adm/fillup-templates/sysconfig.btrfsmaintenance -%dir /usr/share/%{name} -/usr/share/%{name}/* +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/* %dir /usr/lib/zypp/ %dir /usr/lib/zypp/plugins %dir /usr/lib/zypp/plugins/commit @@ -110,7 +114,7 @@ %{_unitdir}/btrfsmaintenance-refresh.service %{_sbindir}/rcbtrfsmaintenance-refresh %else -/etc/cron.hourly/btrfsmaintenance-refresh-cron.sh