Bug#910371: stretch-pu: package lxcfs/2.0.7-1.1
Hi, Am Sonntag, den 21.10.2018, 11:40 +0100 schrieb Adam D. Barratt: > Control: tags -1 + confirmed > > On Tue, 2018-10-09 at 15:52 +0200, Michael Banck wrote: > > 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. > > > > Please go ahead. Thanks, done so now, hopefully correctly as I am not doing stable uploads a lot. Michael -- Michael Banck Projektleiter / Senior Berater Tel.: +49 2166 9901-171 Fax: +49 2166 9901-100 Email: michael.ba...@credativ.de credativ GmbH, HRB Mönchengladbach 12080 USt-ID-Nummer: DE204566209 Trompeterallee 108, 41189 Mönchengladbach Geschäftsführung: Dr. Michael Meskes, Jörg Folz, Sascha Heuer Unser Umgang mit personenbezogenen Daten unterliegt folgenden Bestimmungen: https://www.credativ.de/datenschutz
Bug#910371: stretch-pu: package lxcfs/2.0.7-1.1
Control: tags -1 + confirmed On Tue, 2018-10-09 at 15:52 +0200, Michael Banck wrote: > 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. > Please go ahead. Regards, Adam
Bug#910371: stretch-pu: package lxcfs/2.0.7-1.1
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/changelog2017-05-20 11:00:52.0 +0200
+++ lxcfs-2.0.7/debian/changelog2018-10-09 10:10:16.0 +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 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.0 +0100
+++ lxcfs-2.0.7/debian/patches/revert-the-virtualization-of-btime-field.patch
2018-10-04 23:28:08.0 +0200
@@ -0,0 +1,34 @@
+From 72dd97f7ecfa1e118f4b33b3d694694fcf6fd120 Mon Sep 17 00:00:00 2001
+From: Serge Hallyn
+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
+---
+ 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.0 +0100
+++ lxcfs-2.0.7/debian/patches/series 2018-10-04 23:23:13.0 +0200
@@ -0,0 +1 @@
+revert-the-virtualization-of-btime-field.patch
Bug#910371: stretch-pu: package lxcfs/2.0.7-1.1
On Sat, 6 Oct 2018 14:21:45 +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. ACK from my part as well. signature.asc Description: PGP signature
Bug#910371: stretch-pu: package lxcfs/2.0.7-1.1
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.
Michael
diff -Nru lxcfs-2.0.7/debian/changelog lxcfs-2.0.7/debian/changelog
--- lxcfs-2.0.7/debian/changelog2017-05-20 11:00:52.0 +0200
+++ lxcfs-2.0.7/debian/changelog2018-10-04 16:23:15.0 +0200
@@ -1,3 +1,12 @@
+lxcfs (2.0.7-1.1) 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 Thu, 04 Oct 2018 16:23:15 +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.0 +0100
+++ lxcfs-2.0.7/debian/patches/revert-the-virtualization-of-btime-field.patch
2018-10-04 16:23:15.0 +0200
@@ -0,0 +1,34 @@
+From 72dd97f7ecfa1e118f4b33b3d694694fcf6fd120 Mon Sep 17 00:00:00 2001
+From: Serge Hallyn
+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
+---
+ 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.0 +0100
+++ lxcfs-2.0.7/debian/patches/series 2018-10-04 16:23:15.0 +0200
@@ -0,0 +1 @@
+revert-the-virtualization-of-btime-field.patch
Bug#910371: stretch-pu: package lxcfs/2.0.7-1.1
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. I have sign-off from one of the maintainers: 09:39 < Zhenech> azeem, I don't have much time for LXC(FS) these days, if terceiro does not object, feel free to NMU in stable. Michael -- System Information: Debian Release: 8.10 APT prefers oldstable APT policy: (500, 'oldstable') Architecture: i386 (i686) Kernel: Linux 3.16.0-4-686-pae (SMP w/1 CPU core) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
