On Sat, Oct 06, 2018 at 02:21:45PM +0200, Michael Banck wrote:
> On Fri, Oct 05, 2018 at 05:18:51PM +0200, Michael Banck wrote:
> > Package: release.debian.org
> > Severity: normal
> > Tags: stretch
> > User: release.debian....@packages.debian.org
> > Usertags: pu
> >
> > Hi,
> >
> > I would like to upload a lxcfs NMU to stable, fixing Bug #885542. This
> > would be useful for ci.debian.net autopkgtest, as ci.debian.net
> > currenlty runs lxc from stable.
>
> PFA the debdiff.
And another one, this time with the correct (I hope) versioning.
Michael
diff -Nru lxcfs-2.0.7/debian/changelog lxcfs-2.0.7/debian/changelog
--- lxcfs-2.0.7/debian/changelog 2017-05-20 11:00:52.000000000 +0200
+++ lxcfs-2.0.7/debian/changelog 2018-10-09 10:10:16.000000000 +0200
@@ -1,3 +1,12 @@
+lxcfs (2.0.7-1+deb9u1) stretch; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/revert-the-virtualization-of-btime-field.patch: New patch,
+ reverts the uptime virtualiziation, fixing process start times, adopted
+ from upstream commit 72dd97f7 (Closes: #885542).
+
+ -- Michael Banck <michael.ba...@credativ.de> Tue, 09 Oct 2018 10:10:16 +0200
+
lxcfs (2.0.7-1) unstable; urgency=medium
* New upstream version 2.0.7
diff -Nru
lxcfs-2.0.7/debian/patches/revert-the-virtualization-of-btime-field.patch
lxcfs-2.0.7/debian/patches/revert-the-virtualization-of-btime-field.patch
--- lxcfs-2.0.7/debian/patches/revert-the-virtualization-of-btime-field.patch
1970-01-01 01:00:00.000000000 +0100
+++ lxcfs-2.0.7/debian/patches/revert-the-virtualization-of-btime-field.patch
2018-10-04 23:28:08.000000000 +0200
@@ -0,0 +1,34 @@
+From 72dd97f7ecfa1e118f4b33b3d694694fcf6fd120 Mon Sep 17 00:00:00 2001
+From: Serge Hallyn <se...@hallyn.com>
+Date: Sun, 18 Jun 2017 14:43:22 -0500
+Subject: [PATCH 1/2] (temporarily?) revert the virtualization of btime field
+ in /proc/stat
+
+Closes #189
+
+This seems to be responsible for corrupting STIME on processlist
+inside containers. Hopefully we can find a reasonable way to fix
+both, but compared to unvirtualized btime field, bogus STIME field
+is the greater evil here.
+
+Signed-off-by: Serge Hallyn <se...@hallyn.com>
+---
+ bindings.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+Index: lxcfs-2.0.7/bindings.c
+===================================================================
+--- lxcfs-2.0.7.orig/bindings.c
++++ lxcfs-2.0.7/bindings.c
+@@ -3538,10 +3538,7 @@ static int proc_stat_read(char *buf, siz
+ continue;
+ if (sscanf(line, "cpu%9[^ ]", cpu_char) != 1) {
+ /* not a ^cpuN line containing a number N, just print
it */
+- if (strncmp(line, "btime", 5) == 0)
+- l = snprintf(cache, cache_size, "btime %ld\n",
getreaperctime(fc->pid));
+- else
+- l = snprintf(cache, cache_size, "%s", line);
++ l = snprintf(cache, cache_size, "%s", line);
+ if (l < 0) {
+ perror("Error writing to cache");
+ rv = 0;
diff -Nru lxcfs-2.0.7/debian/patches/series lxcfs-2.0.7/debian/patches/series
--- lxcfs-2.0.7/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ lxcfs-2.0.7/debian/patches/series 2018-10-04 23:23:13.000000000 +0200
@@ -0,0 +1 @@
+revert-the-virtualization-of-btime-field.patch
