diff -Nru tgt-1.0.62/debian/changelog tgt-1.0.62/debian/changelog --- tgt-1.0.62/debian/changelog 2015-12-21 13:37:27.000000000 -0600 +++ tgt-1.0.62/debian/changelog 2016-02-01 02:19:26.000000000 -0600 @@ -1,3 +1,12 @@ +tgt (1:1.0.62-1ubuntu2) xenial; urgency=medium + + + * debian/patches/tgtd_dont_fail_on_eacces.patch + tgtd: fix root-under-userns errors when attempting oom_score_adj + (Closes: LP:#1518440) + + -- Ryan Harper Mon, 01 Feb 2016 02:18:57 -0600 + tgt (1:1.0.62-1ubuntu1) xenial; urgency=low * Merge from Debian unstable (LP: #1524982, LP: #1518440). Remaining diff -Nru tgt-1.0.62/debian/patches/series tgt-1.0.62/debian/patches/series --- tgt-1.0.62/debian/patches/series 2015-12-10 22:14:18.000000000 -0600 +++ tgt-1.0.62/debian/patches/series 2016-01-07 10:20:31.000000000 -0600 @@ -2,3 +2,4 @@ use-docbook-xsl.patch use-dpkg-buildflags.patch do-not-build-html-manpages.patch +tgtd_dont_fail_on_eacces.patch diff -Nru tgt-1.0.62/debian/patches/tgtd_dont_fail_on_eacces.patch tgt-1.0.62/debian/patches/tgtd_dont_fail_on_eacces.patch --- tgt-1.0.62/debian/patches/tgtd_dont_fail_on_eacces.patch 1969-12-31 18:00:00.000000000 -0600 +++ tgt-1.0.62/debian/patches/tgtd_dont_fail_on_eacces.patch 2016-02-01 01:53:54.000000000 -0600 @@ -0,0 +1,17 @@ +Description: tgtd.c: don't fail oom_adjust on EACCESS + Under user-namespace, uid=0 only has user privs and + fails to adjust oom score; this is non-fatal. +Author: Ryan Harper +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/tgt/+bug/1518440 +Last-Update: 2016-01-07 +--- a/usr/tgtd.c ++++ b/usr/tgtd.c +@@ -604,7 +604,7 @@ + } + + err = oom_adjust(); +- if (err && getuid() == 0) ++ if (err && (errno != EACCES) && getuid() == 0) + exit(1); + + err = nr_file_adjust();