Merge ~bryce/ubuntu/+source/logwatch:sru-lp1880211-bionic into ubuntu/+source/logwatch:ubuntu/bionic-devel
Status: | Merged |
---|---|
Approved by: | Bryce Harrington |
Approved revision: | b226d5277a7ca3f2ef460ef63cb518dbeebbea69 |
Merge reported by: | Christian Ehrhardt |
Merged at revision: | b226d5277a7ca3f2ef460ef63cb518dbeebbea69 |
Proposed branch: | ~bryce/ubuntu/+source/logwatch:sru-lp1880211-bionic |
Merge into: | ubuntu/+source/logwatch:ubuntu/bionic-devel |
Diff against target: |
118 lines (+52/-35) 4 files modified
debian/changelog (+9/-0) debian/patches/0010-zz-zfs-detect-zfs-location.patch (+42/-0) debian/patches/series (+1/-1) dev/null (+0/-34) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christian Ehrhardt (community) | Approve | ||
git-ubuntu developers | Pending | ||
Canonical Server | Pending | ||
Review via email: mp+401256@code.launchpad.net |
Description of the change
This corrects an earlier URL that pulled in upstream's reimplementation of our proposed fix, but which actually introduced a regression. The new code assumed Perl's -x operator considers the $PATH, but it doesn't appear to do so. Instead, we need to explicitly check abspaths in order to find zfs.
This also tightens up requirements to require both `zfs` and `zpool` to be available, and not just assume if one is the other will too.
Note that installing zfsutils-linux in LXC seems to be pretty fussy about kernel module versions, so my testing has been a bit synthetic (and I suppose is why the original issue slipped through). So extra attention on testing in review would be appreciated.
/me was confused by Hirsutes "debian/ patches/ 0001-00- debspecific- disable- su-reporting- in-secure. diff.patch" being so very different to Bionics "d/p/0010- 00-debspecific- disable- su-reporting- in-secure. diff.patch" - but yeah - if I ignore that and just look at Bionic it seems fine.
We replace the former (non-perfect) solution with the new better fix.
Other than that hickup the change still is the same as in Hirsute which LGTM
+1