control: tags -1 -moreinfo >I'm interested in seeing an updated debdiff with a better wording for >the xhost issue. The proposed one suggests a syntax error but says >nothing about the permission issues which need a fix. ok, fair enough, updated >Similarly, the OOM_ADJ handling could be more descriptive, something >like “Try both oom_score_adj and oom_adj when adjusting the OOM score >(Closes: #843663).”? this seems really better and more descriptive, indeed. Updated debdiff attached thanks G.
diff -Nru boinc-7.4.23+dfsg/debian/boinc-client.init boinc-7.4.23+dfsg/debian/boinc-client.init
--- boinc-7.4.23+dfsg/debian/boinc-client.init 2014-10-17 17:10:09.000000000 +0200
+++ boinc-7.4.23+dfsg/debian/boinc-client.init 2016-11-08 21:53:59.000000000 +0100
@@ -29,6 +29,7 @@
BOINC_DIR=/var/lib/boinc-client
BOINC_CLIENT=/usr/bin/boinc
BOINC_OOM_ADJ=15
+BOINC_OOM_SCORE_ADJ=1000
#VALGRIND_OPTIONS="-v --log-file=/tmp/valgrind_boinc.log "
VALGRIND_OPTIONS=""
@@ -106,7 +107,7 @@
else
if [ -n "$DISPLAY" -a -x /usr/bin/xhost ]; then
# grant the boinc client to perform GPU computing
- xhost local:boinc || echo -n "xhost error ignored, GPU computing may not be possible"
+ xhost +si:localuser:$BOINC_USER || echo -n "xhost error ignored, GPU computing may not be possible"
fi
if [ -n "$VALGRIND_OPTIONS" ]; then
start-stop-daemon --start --quiet --background --pidfile $PIDFILE \
@@ -206,10 +207,13 @@
fi
fi
for BPID in ${pid} ${children}; do
- if [ -w /proc/${BPID}/oom_adj ]; then
- echo ${BOINC_OOM_AD} > /proc/${BPID}/oom_adj 2>/dev/null || true
+ # Fallback to old oom_adj if oom_score_adj doesn't exist
+ if [ -w /proc/${BPID}/oom_score_adj ]; then
+ echo ${BOINC_OOM_SCORE_ADJ} > /proc/${BPID}/oom_score_adj 2>/dev/null || true
+ elif [ -w /proc/${BPID}/oom_adj ]; then
+ echo ${BOINC_OOM_ADJ} > /proc/${BPID}/oom_adj 2>/dev/null || true
else
- echo "Could not write to /proc/${BPID}/oom_adj"
+ echo "Could not adjust oom_score of task"
fi
done
fi
diff -Nru boinc-7.4.23+dfsg/debian/changelog boinc-7.4.23+dfsg/debian/changelog
--- boinc-7.4.23+dfsg/debian/changelog 2014-10-17 17:19:50.000000000 +0200
+++ boinc-7.4.23+dfsg/debian/changelog 2016-11-08 21:53:59.000000000 +0100
@@ -1,3 +1,16 @@
+boinc (7.4.23+dfsg-1+deb8u1) jessie; urgency=medium
+
+ [ Tom Downes ]
+ * Try both oom_score_adj and oom_adj when adjusting the OOM score
+ (Closes: #843663).
+
+ [ Mike Brennan <debian@u4ear.com> ]
+ * Fix xhost syntax. (Closes: #841665)
+ - the xhost permissions syntax requires a "localuser" keyword for locally
+ specified users.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 08 Nov 2016 21:53:59 +0100
+
boinc (7.4.23+dfsg-1) unstable; urgency=medium
* New upstream release candidate.
Attachment:
signature.asc
Description: OpenPGP digital signature