Git log: commit a06c63a4c1f26b0aac786aab916a222e79d3ace5
Merge: 3130987 966c6fc
Author: Reinhard Tartler <siretart@tauware.de>
Date: Mon Feb 12 11:39:15 2024 +0000
Merge remote-tracking branch 'dgit/dgit/sid'
commit 3130987577c028c6dc2e615eb6184c8d34ad45c5
Author: Reinhard Tartler <siretart@tauware.de>
Date: Mon Feb 12 11:35:35 2024 +0000
debian/changelog: update
commit 6d105b6bf2dd4d12abb874e1927b17dc9ff75a15
Author: Reinhard Tartler <siretart@tauware.de>
Date: Mon Feb 12 11:36:29 2024 +0000
disable autopkgtest on salsa
no meaningful tests to run anyways
commit 853a30c997e542b1fc59b626bbd144c32a97bc6f
Author: Reinhard Tartler <siretart@tauware.de>
Date: Mon Feb 12 11:35:15 2024 +0000
bump standards version, no changes needed
commit 3a361d701a05ed155171506b3b685af9fe17150a
Author: Reinhard Tartler <siretart@tauware.de>
Date: Mon Feb 12 01:36:41 2024 +0000
debian/changelog: update
commit cc9f97a508452ae7db13930f2bf8c6010cabb091
Author: Reinhard Tartler <siretart@tauware.de>
Date: Mon Feb 12 01:30:20 2024 +0000
fix clean target, closes: #1044372
commit d805cf06d82fcb843d315a6b21656cad1031a45d
Author: Reinhard Tartler <siretart@tauware.de>
Date: Mon Feb 12 01:29:59 2024 +0000
drop unused override
commit 4ce8166bcd13b6af9f7c1de1fa48bc39a6aa986c
Author: Reinhard Tartler <siretart@tauware.de>
Date: Mon Feb 12 01:27:36 2024 +0000
debian/watch: update
commit 806d76cac654578ddf1a9936949c90ae72214ad5
Merge: bcf771a 124253b
Author: Reinhard Tartler <siretart@tauware.de>
Date: Mon Feb 12 01:18:59 2024 +0000
Update upstream source from tag 'v2.1.10+ds1'
Update to upstream version '2.1.10+ds1'
with Debian dir 00673b3cff65043f208cdcd462488ae86bddcdc3
commit bcf771a6533d343e8d13c4cece442e5ca9d4e750
Author: Reinhard Tartler <siretart@tauware.de>
Date: Mon Feb 12 01:16:51 2024 +0000
debian/watch: update
commit 966c6fc3ad4e084bbb9757671e860d9f3dc85b0c
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Feb 11 18:41:54 2023 +0100
debian/changelog: update
commit 172640544d31b906a5464df0ae13094bd02d09b0
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Feb 11 16:40:43 2023 +0100
Avoid Build-Depends on golang-go, Closes: #1023042
commit 6af3130697b402c009c07e75bbcd670882d39799
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Feb 11 16:38:15 2023 +0100
debian/changelog: prepare new upload
commit db63227ad24b87871325dd7932bc9c9e2b9a22c5
Merge: cfce7b5 5a49683
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Feb 11 16:35:57 2023 +0100
Merge tag 'upstream/2.1.6+ds1'
commit 5a496837b906235a673cf9c1827b799d5449bd13
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Feb 11 16:35:15 2023 +0100
remove vendor
commit cfce7b57a710fd6686c6a7687dda5b3a26982de8
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Aug 6 16:12:43 2022 +0200
debian/changelog: update
commit faa63fd53088275ed63129d3ea7c860f6b5d351f
Merge: 4b647b9 83d09ed
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Aug 6 16:05:39 2022 +0200
Merge version v2.1.3+ds1
commit 83d09ed2d9a9aba5f7a4b6466764e7ed1b0b6ee1
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Aug 6 16:05:17 2022 +0200
remove tools
commit 4b647b9a7c807fa94577c8610ba3d1f5604f826f
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sun Jul 3 18:15:18 2022 -0400
debian/changelog: update
commit a444ee406d072e5908922ea9e9a534f4802ee569
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sun Jul 3 18:14:41 2022 -0400
Add golang-github-containers-conmon-dev
package is used by libpod/podman
commit f9c59622dea53ce2e028b965068cb26c70fddf3b
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sun Jul 3 17:25:29 2022 -0400
debian/changelog: update
commit 942f40e6cd4e9ed6bd3fdf05dadccf8c0dfd73c9
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sun Jul 3 17:24:59 2022 -0400
debian/upstream/metadata: add bug-database
commit 6fd816c213ee838f3ecb2b40761d77e949a26bf6
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sun Jul 3 17:22:18 2022 -0400
Bump standards-version, no changes needed
commit f4b24304ef30cc1e34ba40f61900a617e720a048
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sun Jul 3 17:21:35 2022 -0400
debian/copyright: normalize with 'cme update dpkg-copyright'
commit c44f9aa58e18469b6e42013335da9696eea0407c
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sun Jul 3 16:55:15 2022 -0400
new upstream release
commit 0ed4e91040b734b351930f0b17fbe154550f3300
Merge: d7902c1 b8142e8
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sun Jul 3 16:52:28 2022 -0400
Merge tag 'upstream/2.1.2+ds1'
commit b8142e8308c47c73d19bf51f785625b9d7469871
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sun Jul 3 16:51:56 2022 -0400
remove vendor
commit d7902c1dd8783a77eda4d928676f03b4188bd576
Merge: c20c8c2 7ee7482
Author: Reinhard Tartler <siretart@debian.org>
Date: Sun Jul 3 20:48:58 2022 +0000
Merge branch 'remove-myself-from-uploaders' into 'master'
Remove myself from uploaders
See merge request podman-team/conmon!5
commit c20c8c256c177d39d4945bf0eca21bffce5ba8bf
Author: Reinhard Tartler <siretart@tauware.de>
Date: Wed May 18 21:06:28 2022 -0400
debian/changelog: update
commit c331255d5ebd1ece0dbd0546318aa7c8d281cfe3
Author: Reinhard Tartler <siretart@tauware.de>
Date: Wed May 18 21:05:58 2022 -0400
remove patches, merged upstream
commit fd96fc548d346069e0d4edc295cf9b5c430e22fa
Merge: ac87022 57e90c2
Author: Reinhard Tartler <siretart@tauware.de>
Date: Wed May 18 21:05:16 2022 -0400
Merge remote-tracking branch 'dgit/dgit/sid'
commit ac87022d0341136fae6eba6b8339d0b75346d9d2
Author: Reinhard Tartler <siretart@tauware.de>
Date: Wed May 18 20:27:06 2022 -0400
depend on libseccomp-dev
commit 5501f2557fe11c82df31f0d1063bf4165746f7e0
Author: Reinhard Tartler <siretart@tauware.de>
Date: Wed May 18 20:25:36 2022 -0400
debian/changelog: update
commit cd0cb012cc633d8365d703483cabe8dcbc198447
Merge: 6cc7e9f 42fc753
Author: Reinhard Tartler <siretart@tauware.de>
Date: Wed May 18 20:25:14 2022 -0400
Merge tag 'upstream/2.1.0+ds1'
commit 42fc753da38329f8154a8fc459adf5af4c60ec7c
Author: Reinhard Tartler <siretart@tauware.de>
Date: Wed May 18 20:24:51 2022 -0400
remove tools/
commit 57e90c2202f94c2a3e15b10b7085cf497fca1352
Merge: 6cc7e9f b493f55
Author: Adrian Bunk <bunk@debian.org>
Date: Wed Jul 14 13:46:07 2021 -0400
Record conmon (2.0.25+ds1-1.1) in archive suite sid
commit b493f5522b88519551799dbf7ab163354669b6e8
Author: Mrunal Patel <mrunalp@gmail.com>
Date: Thu May 27 14:09:39 2021 -0700
Reset OOM score back to 0 for container runtime
We don't want container runtime procesess to be unkillable
so we reset oom_score_adj back to 0 before execv
of the runtime process.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Gbp-Pq: Name 0001-Reset-OOM-score-back-to-0-for-container-runtime.patch
commit 5b800435b853e40969698354a5a2179a870035a2
Merge: a5a2399 cb29a62
Author: Adrian Bunk <bunk@debian.org>
Date: Wed Jul 14 13:46:07 2021 -0400
conmon (2.0.25+ds1-1.1) unstable; urgency=medium
* Non-maintainer upload.
* Add upstream fix to not make container runtime processes
unkillable. (Closes: #990263)
[dgit import unpatched conmon 2.0.25+ds1-1.1]
commit cb29a6289e45ddfac2ca090437bb76d403e8e232
Author: Adrian Bunk <bunk@debian.org>
Date: Wed Jul 14 13:46:07 2021 -0400
Import conmon_2.0.25+ds1-1.1.debian.tar.xz
[dgit import tarball conmon 2.0.25+ds1-1.1 conmon_2.0.25+ds1-1.1.debian.tar.xz]
commit 6cc7e9f66d64753df95e5241b8650301d5d2f2fd
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Jan 30 22:57:15 2021 -0500
debian/changelog: update
commit d591cc4f8b426fe77d16bbaf5c9f2af43f9b5b01
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Jan 30 23:08:15 2021 -0500
debian/copyright: normalize with 'cme update dpkg-copyright'
commit 1f0b257598a09b581fab74ee5034972d567bf0e4
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Jan 30 23:01:11 2021 -0500
Install conmon to /usr/bin (Closes: #944104)
commit a5a2399610e8a47626b34e738779f826de588c4e
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Jan 30 22:56:56 2021 -0500
Import conmon_2.0.25+ds1.orig.tar.xz
[dgit import orig conmon_2.0.25+ds1.orig.tar.xz]
commit 5f4d258cf9548fac62348e040d107b5fab5a01b2
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Jan 30 22:56:08 2021 -0500
Build and install manpage conmon(8)
commit 47908bb65f302a33c67332623ce1adf84e3e36cf
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Jan 30 22:55:30 2021 -0500
Package without vendored tools/ subdirectory
commit bd76c8ae4d85e7e70b2774eff75778bc0765681d
Merge: e4cdec0 995c454
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Jan 30 22:51:25 2021 -0500
Merge commit '995c454bf64ee4ace9fe6bac4b15debc7c4325f3'
commit 995c454bf64ee4ace9fe6bac4b15debc7c4325f3
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Jan 30 22:50:56 2021 -0500
delete tools/ directory
go-md2man is already packaged in debian
commit 7ee74829329c21d54e70973c1620651224f71001
Author: Birger Schacht <birger@debian.org>
Date: Fri Nov 13 18:06:25 2020 +0000
Remove myself from uploaders
commit e4cdec09e4e85970ddbc3935e534612e606349ed
Merge: 506d092 bb69f33
Author: Reinhard Tartler <siretart@tauware.de>
Date: Mon Aug 10 10:13:27 2020 -0400
Declare fast forward from 2.0.18-1
[dgit --overwrite]
commit 506d09252963d39a06294dcb4c7c4b62e98db9ef
Author: Reinhard Tartler <siretart@tauware.de>
Date: Mon Aug 10 15:25:50 2020 -0400
debian/changelog: update
commit 3d2504ad67d0b019c362ba824c42d2a625b605f6
Author: Reinhard Tartler <siretart@tauware.de>
Date: Mon Aug 10 15:25:41 2020 -0400
debian/control: Add myself to uploaders
commit c40dfe6bcab5b3c76acd8b276448823611535a67
Merge: b721b00 13244db
Author: Reinhard Tartler <siretart@tauware.de>
Date: Mon Aug 10 15:23:47 2020 -0400
Merge upstream release v2.0.20
commit bb69f33b64641ed8fdb8e08586a1b0a5b4b75708
Merge: 6ba9d47 176665a
Author: Reinhard Tartler <siretart@tauware.de>
Date: Mon Aug 3 12:57:11 2020 -0400
Declare fast forward from 2.0.9-1
[dgit --quilt=gbp --overwrite]
commit 6ba9d479882edfbb4aea2e742ddeb759ad13e9d1
Author: Reinhard Tartler <siretart@tauware.de>
Date: Mon Aug 3 12:57:16 2020 -0400
Upload to unstable
commit 7f583b4b88d536f3a6d0b34f86e5e6e5cf4050a0
Author: Reinhard Tartler <siretart@tauware.de>
Date: Sat Jul 11 07:22:10 2020 -0400
debian/changelog: update
commit 07861b26f64c8e0bd6de2027153d93d589d8b79a
Author: Reinhard Tartler <siretart@tauware.de>
Date: Fri Jul 10 20:02:34 2020 -0400
disable 'make test'
commit 89615ff4b4012a93a27ac01574f6d1b850b34d98
Author: Reinhard Tartler <siretart@tauware.de>
Date: Fri Jul 10 19:59:21 2020 -0400
debian/changelog: update
commit 6fea5943604af321ed467d23177c50e6903e3cc3
Merge: b721b00 a9f1644
Author: Reinhard Tartler <siretart@tauware.de>
Date: Fri Jul 10 19:58:41 2020 -0400
Update upstream source from tag 'v2.0.18'
Update to upstream version '2.0.18'
with Debian dir af168e1736590ad6c47ba5a48da5ad43be83c1dd
commit b721b008b423bade8a61725d68d29e9ca0890b28
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Date: Thu Jan 16 20:48:48 2020 +1100
New upstream release + changelog summary
commit 18650cb7bcb6bdeb029c58d97438b10e52026576
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Date: Thu Jan 16 20:48:14 2020 +1100
Install README
commit 176665a8098b82aa3852c601b9dfe2eeabf90c26
Merge: 01f0035 e535046
Author: Dmitry Smirnov <onlyjob@debian.org>
Date: Thu Jan 16 04:45:49 2020 -0500
conmon (2.0.9-1) unstable; urgency=medium
* New upstream release.
* Install README.
* Added myself to Uploaders.
[dgit import unpatched conmon 2.0.9-1]
commit 01f003547d833dfdd751978eeaa6dbbfe4e4260a
Author: Dmitry Smirnov <onlyjob@debian.org>
Date: Thu Jan 16 04:45:49 2020 -0500
Import conmon_2.0.9.orig.tar.xz
[dgit import orig conmon_2.0.9.orig.tar.xz]
commit e53504616a0461e51b00aa64feb1adcf347457af
Author: Dmitry Smirnov <onlyjob@debian.org>
Date: Thu Jan 16 04:45:49 2020 -0500
Import conmon_2.0.9-1.debian.tar.xz
[dgit import tarball conmon 2.0.9-1 conmon_2.0.9-1.debian.tar.xz]
commit 598a11a0b56a18e41c8490c9aebeb3c89dc28ce7
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Date: Thu Jan 16 20:43:14 2020 +1100
Merged release 2.0.9
Squashed commit of the following:
commit 60b42f20f222df9da07a01ee444327348b9f54ee
Author: Peter Hunt <pehunt@redhat.com>
Date: Mon Jan 6 10:52:09 2020 -0500
bump to version 2.0.9
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit 1560392d56352c7eccabb7219fcd6a2c5ab81774
Author: Mrunal Patel <mrunalp@gmail.com>
Date: Sat Jan 4 13:04:58 2020 -0800
Add TimedOutMessage to config to share with go code
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
commit b17d81bd7dbfc39ea85593e2a113c0c604d6eb1b
Author: Riccardo Schirone <sirmy15@gmail.com>
Date: Fri Dec 20 17:38:42 2019 +0100
Fixes format string to limit the size of the string to 10 characters
%10s just ensures that when printing, at least 10 characters are
written. However, in this case we probably want *at most* 10 characters
to be written.
Signed-off-by: Riccardo Schirone <sirmy15@gmail.com>
commit 3a11e260a4b81503199ae073dbce0bf9839049ce
Author: Riccardo Schirone <sirmy15@gmail.com>
Date: Fri Dec 20 18:20:28 2019 +0100
g_file_{get,set}_contents return a gboolean to indicate failure, use it
Signed-off-by: Riccardo Schirone <sirmy15@gmail.com>
commit c2e2e6723ce522e6400cfeedc9fad212d0462d8c
Merge: fe2ebfd 0c66b66
Author: Daniel J Walsh <dwalsh@redhat.com>
Date: Fri Dec 13 14:35:09 2019 -0500
Merge pull request #105 from haircommander/bump-2.0.8
Bump 2.0.8
commit 0c66b669a8a9569c5703300b52c8fb11ebf63925
Author: Peter Hunt <pehunt@redhat.com>
Date: Fri Dec 13 14:22:13 2019 -0500
bump to 2.0.9-dev
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit 5ca7df27cb3a6f1edaab1a40fcc61cc6c16d9308
Author: Peter Hunt <pehunt@redhat.com>
Date: Fri Dec 13 14:22:00 2019 -0500
bump to 2.0.8
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit fe2ebfd64892aac76f8953df712130290f1a650c
Merge: c8f7443 5bbd452
Author: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Fri Dec 13 20:20:44 2019 +0100
Merge pull request #104 from haircommander/revert-oom
Revert "conmon: check oom counter on cgroup v1"
commit 5bbd452f205e774a0e13b85c3ee19203495bb49a
Author: Peter Hunt <pehunt@redhat.com>
Date: Fri Dec 13 12:09:27 2019 -0500
Revert "conmon: check oom counter on cgroup v1"
This reverts commit 4100fb20bc156fdd602f8684affa27e6b139d0ad.
We found issues where the reading of the memory control file was racing with the cgroup manager's write. while we want to prevent false positives, not having false negatives is more important. Revert this commit until we find a more complete solution.
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit c8f7443640371822b4fa83c2df94733d650c4daf
Merge: 036ff29 7d8faa7
Author: Mrunal Patel <mrunal@me.com>
Date: Thu Dec 12 15:13:27 2019 -0800
Merge pull request #102 from haircommander/cgroup_v2_persist
persist oom files on cgroup v2
commit 7d8faa73dc9b24d271be2834aa4009de3fd90d7e
Author: Peter Hunt <pehunt@redhat.com>
Date: Thu Dec 12 11:04:52 2019 -0500
persist oom files on cgroup v2
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit 036ff29786bbdd941403536b13320382e636a120
Author: Peter Hunt <pehunt@redhat.com>
Date: Thu Dec 12 13:56:07 2019 -0500
bump to v2.0.8-dev
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit d532caebc788fafdd2a305b68cd1983b4039bea4
Author: Peter Hunt <pehunt@redhat.com>
Date: Thu Dec 12 13:55:53 2019 -0500
bump to v2.0.7
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit faccd4016c963ff99f1239f645bd2a87813b1b52
Merge: 0760156 7d4c6be
Author: Mrunal Patel <mrunal@me.com>
Date: Thu Dec 12 10:49:47 2019 -0800
Merge pull request #100 from giuseppe/splice
conmon: use splice(2) to copy from stdin
commit 07601566eb6ac13ce8003b7a62149ffacd04d349
Merge: 4100fb2 dc23660
Author: Mrunal Patel <mrunal@me.com>
Date: Thu Dec 12 10:48:58 2019 -0800
Merge pull request #101 from haircommander/bump-2.0.7
Bump 2.0.7
commit dc236607c7dd393de8934f580c117e3d7136fed2
Author: Peter Hunt <pehunt@redhat.com>
Date: Thu Dec 12 12:59:36 2019 -0500
bump to version 2.0.8-dev
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit c35049c44303942da61560491caeba86e8d3fb67
Author: Peter Hunt <pehunt@redhat.com>
Date: Thu Dec 12 12:59:18 2019 -0500
bump to version 2.0.7
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit 7d4c6be9fe8b232c38ef0773e13aad5e13306528
Author: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Thu Dec 12 15:24:43 2019 +0100
conmon: use splice(2) to copy from stdin
the first advantage is that it is much faster as data is not copied
from the kernel to the userspace and the back to the kernel, and the
second advantage is that we don't block on writ'ing on the fd all the
data we've buffered.
Closes: https://github.com/containers/conmon/issues/99
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
commit 4100fb20bc156fdd602f8684affa27e6b139d0ad
Author: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Thu Dec 12 12:14:05 2019 +0100
conmon: check oom counter on cgroup v1
when running on cgroup v1, also check whether the OOM counter is > 0
before writing the "oom" file.
Previously, conmon was detecting an OOM every time an event fd was
triggered.
Unfortunately that is not enough, as an event on the eventfd is also
triggered when the cgroup is deleted. That could cause a race
condition where conmon sees the event from the cgroup deletion before
the SIGCHLD+SIGUSR1. That could happen for example when systemd
CollectMode is set for failed units.
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1782601
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
commit 95ed45ab361ede2dbd5e727d6e485f33f94b6f30
Merge: 8ba9575 82ef9c7
Author: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Thu Dec 12 12:21:59 2019 +0100
Merge pull request #97 from mrunalp/persist_oom_file
Persist the oom file when --persist-dir is specified
commit 82ef9c776ba543a9328d6a9dddc66dcc38be0af7
Author: Mrunal Patel <mrunalp@gmail.com>
Date: Wed Dec 11 14:49:23 2019 -0800
Persist the oom file when --persist-dir is specified
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
commit 8ba95756ee81607edc1d20704f6c86140493ece0
Author: Peter Hunt <pehunt@redhat.com>
Date: Wed Dec 11 09:04:43 2019 -0500
bump to v2.0.7-dev
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit 29c336700f2999acf9db07662b4a61355076e64a
Author: Peter Hunt <pehunt@redhat.com>
Date: Wed Dec 11 09:04:25 2019 -0500
bump to v2.0.6
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit ba14d9cc75d26d4e5db5d8b522dfc18b9bea90e5
Author: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Wed Dec 11 14:05:44 2019 +0100
conmon: kill the process group on timeout
when the timeout is expired, instead of killing the process, make sure
to kill the entire process group.
It is not safe as using pid cgroup or a pid namespace, which we cannot
use as the script must run inside of the container pid namespace, but
it addresses most common cases like bash forking a new process.
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1774184
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
commit bc9e976d7f198c8d840968ae51da67da70c397a6
Author: Peter Hunt <pehunt@redhat.com>
Date: Tue Dec 10 12:48:56 2019 -0500
bump to v2.0.6-dev
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit f91c1703d9a9aa734cbc3871e84c35d14499d305
Author: Peter Hunt <pehunt@redhat.com>
Date: Tue Dec 10 12:48:39 2019 -0500
bump to v2.0.5
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit c7925031cf675d6cda2d0d5059fb35d6c269e0f0
Author: Mrunal Patel <mrunalp@gmail.com>
Date: Mon Dec 9 11:23:02 2019 -0800
Write exit file to container bundle directory
Write the exit file under the container bundle directory so
it is available even when we restart the node. Also, keeping
it scoped there makes the cleanup easier.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
commit fd5ac47bc3d61456faee2e517da1c59371d7e7e8
Merge: df8c6aa c6835ed
Author: Daniel J Walsh <dwalsh@redhat.com>
Date: Mon Dec 9 12:27:55 2019 -0500
Merge pull request #91 from haircommander/version-2.0.4
bump to version 2.0.4
commit c6835edaeb42a9b4536c2143ebb2a7708ea7b063
Author: Peter Hunt <pehunt@redhat.com>
Date: Mon Dec 9 11:04:44 2019 -0500
bump to version 2.0.5-dev
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit d930e38f50d1c062cedd5ac159293841622478b6
Author: Peter Hunt <pehunt@redhat.com>
Date: Mon Dec 9 11:04:10 2019 -0500
bump to version 2.0.4
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit df8c6aa516b22ca8fd28903024a90d9093d383e5
Author: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Mon Dec 2 16:41:03 2019 +0100
conmon: fix tight loop on OOM
inotify fails with EINVAL when trying to read an event with a too
small buffer.
Increase the size to "sizeof(struct inotify_event) + NAME_MAX + 1",
that is enough to read at least one event.
Closes: https://github.com/containers/conmon/issues/87
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
commit 42bce451a613f56ae9d6466ac89b3e41594fb93f
Merge: f6d23b5 5ae9942
Author: Daniel J Walsh <dwalsh@redhat.com>
Date: Fri Nov 29 06:34:52 2019 -0500
Merge pull request #89 from DaanDeMeyer/reduce-error-impact
Initialize the endpoint for attach before calling fork.
commit 5ae994270b1490684b9a03f1b2fa47b15f61f6cb
Author: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed Nov 27 21:24:16 2019 +0100
Initialize the endpoint for attach before calling fork.
This way, when an error occurs in the attach endpoint logic, conmon can
exit immediately without having to clean up the child process.
commit f6d23b51a3c56cccd4e13b4eea361e98e1855802
Merge: 098fcce 951052b
Author: Daniel J Walsh <dwalsh@redhat.com>
Date: Mon Nov 11 15:48:46 2019 -0500
Merge pull request #83 from haircommander/bump-2.0.4
Bump to 2.0.3
commit 951052b62fdfdf2dd61efa2ad03b5fdbfc93c3ba
Author: Peter Hunt <pehunt@redhat.com>
Date: Mon Nov 11 10:16:39 2019 -0500
version 2.0.4-dev
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit eb5fa88c26fde5ce1e3f8a1d2a8a9498b2d7dbe6
Author: Peter Hunt <pehunt@redhat.com>
Date: Mon Nov 11 10:16:23 2019 -0500
version 2.0.3
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit 098fcceaecb68c47034b3789e9d63f1c5283b6a3
Merge: 002da25 496e8e4
Author: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Mon Nov 11 16:09:42 2019 +0100
Merge pull request #82 from haircommander/try_other_pipe
Handle window resize events in a different fifo
commit 496e8e41e2b31dece6399e3bf89630c8a8dc63af
Author: Peter Hunt <pehunt@redhat.com>
Date: Thu Nov 7 22:01:48 2019 -0500
config: include the two ctrl events
Rather than having a comment saying "this should stay in sync", let's define a variable and import it there, so we're guarenteed to stay in sync
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit 1ed4f0213cd68d7697585ff407533cf5dacd3bcf
Author: Peter Hunt <pehunt@redhat.com>
Date: Tue Nov 5 15:25:00 2019 -0500
Handle window resize events in a different fifo
The terminal_ctrl_fd was being overloaded with events. CRI-O wants to reopen the log files at any time, and podman wants to not drop window resize events on exec.
But we can have both.
Introduce winsz_fd_*, a special fifo pair for window resize events. The terminal_ctrl passes window resize events to the write side, and the read side can process them (after masterfd_stdout is initialized, so we have somewhere to write to and we don't drop events).
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit 002da2522941fde456f5213c8a5a96c9836c2592
Merge: 19a1d5c 8d66f44
Author: Daniel J Walsh <dwalsh@redhat.com>
Date: Tue Nov 5 09:13:28 2019 -0500
Merge pull request #81 from giuseppe/opt-tag
src: add new option --log-tag
commit 8d66f44c6237ba1184538efbd45f2156e83659bc
Author: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Tue Nov 5 09:59:07 2019 +0100
src: add new option --log-tag
it specifies an additional tag to use for logging messages.
When using journald, it adds a tag "CONTAINER_TAG".
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
commit 19a1d5c48f5c05ec6fb72ec95411e51f25743460
Author: Sascha Grunert <sgrunert@suse.com>
Date: Tue Oct 15 13:08:12 2019 +0200
Add 'trace' log level support
The trace log level is currently not supported by conmon, but seems to be
a valid level for container runtimes like CRI-O and podman. This results
that the container currently won't start if the log level is set to
'trace'. Beside this, we now case insensitively compare the log level
string to make it more fail safe.
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
commit bc758d8bd98a29ac3aa4f62a886575bfec0e39a1
Merge: e37aa48 cb4d0e3
Author: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Fri Oct 11 08:23:02 2019 +0200
Merge pull request #77 from haircommander/v2.0.2-bump
bump to 2.0.2
commit cb4d0e38210edfa945eeab783277cc8db9a8824d
Author: Peter Hunt <pehunt@redhat.com>
Date: Thu Oct 10 08:42:17 2019 -0400
version 2.0.3-dev
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit 65fe0226d85b69fc9e527e376795c9791199153d
Author: Peter Hunt <pehunt@redhat.com>
Date: Thu Oct 10 08:41:45 2019 -0400
version 2.0.2
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit e37aa48838b7d03cc7fcefcf86a3fd6035d2038b
Merge: 0e888a9 067c0a5
Author: Daniel J Walsh <dwalsh@redhat.com>
Date: Thu Oct 10 06:42:21 2019 -0400
Merge pull request #76 from giuseppe/fix-podman-hang
conmon: close the sync pipe before exit command
commit 067c0a5ca47aa261e99521b32d6c74a8588b918c
Author: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Wed Oct 9 17:41:06 2019 +0200
conmon: close the sync pipe before exit command
before calling the exit command be sure the sync pipe is closed so
that the waiting process can stop waiting.
It solves an issue with Podman where the cleanup process could hang
since the container is already locked by the podman process waiting
on the sync pipe. The reproducer here:
podman --runtime /bin/false run --rm alpine true
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
commit 0e888a95b9f7a632ce2557332967e142675cb661
Author: Sascha Grunert <sgrunert@suse.com>
Date: Mon Oct 7 11:45:45 2019 +0200
Add static binary build to Cirrus CI
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
commit 422ce21f1527f7624982748a36601401887aa181
Merge: 7286971 d7c90bd
Author: Daniel J Walsh <dwalsh@redhat.com>
Date: Wed Sep 18 07:34:52 2019 -0400
Merge pull request #74 from haircommander/conn_sock_config
Add CONN_SOCK_BUF_SIZE to config
commit d7c90bdc5d17f8f55b17eef89f11e1fc31843425
Author: Peter Hunt <pehunt@redhat.com>
Date: Tue Sep 17 15:04:35 2019 -0400
Add CONN_SOCK_BUF_SIZE to config
instead of having a note that says to sync the value
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit 72869713e1204b86ff19fff654e556858a81ecc6
Author: Valentin Rothberg <rothberg@redhat.com>
Date: Fri Sep 13 16:20:48 2019 +0200
bump to v2.0.2-dev
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
commit 4dc8bcfec41e10ca760c8e2089474c2843dfd066
Author: Valentin Rothberg <rothberg@redhat.com>
Date: Fri Sep 13 16:20:28 2019 +0200
v2.0.1
* set masterfd_stdout before regsitering ctrl_cb
* Add static & containerized targets to Makefile.
* Makefile: don't fail if clean is called without a build
* Fix compilation with clang
* conmon: propagate error code from the container
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
commit 35437e482a0a5c08721e890023aa0bb6bf1e42a7
Merge: 4d36cb6 9e1e1ff
Author: Valentin Rothberg <rothberg@redhat.com>
Date: Fri Sep 13 10:11:09 2019 +0200
Merge pull request #71 from haircommander/stdout-wait-ctrl
set masterfd_stdout before regsitering ctrl_cb
commit 9e1e1ffc5488ee8ff53057a855f1bd5343895695
Author: Peter Hunt <pehunt@redhat.com>
Date: Thu Sep 12 15:59:20 2019 -0400
set masterfd_stdout before regsitering ctrl_cb
exec with conmon ran into issues because the manager attempted to resize the window before stdout was configured. Thus, we got the ctrl_cb from the caller, but had no where to send the ioctl.
Fix this by registering the callback after we set stdout.
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit 4d36cb6af54f6963c5bf2d449f36057a22783974
Merge: fac48d0 58ce137
Author: Daniel J Walsh <dwalsh@redhat.com>
Date: Wed Sep 4 16:06:00 2019 -0400
Merge pull request #69 from mgoltzsche/static-build
Add static & dockerized targets to Makefile.
commit 58ce1379fff02730abee077e8c48f97c635ad0df
Author: Max Goltzsche <max.goltzsche@gmail.com>
Date: Tue Sep 3 21:57:38 2019 +0200
Add static & containerized targets to Makefile.
Signed-off-by: Max Goltzsche <max.goltzsche@gmail.com>
commit fac48d034d625f5366a6526f94e362deaa14d18d
Merge: 8a56404 6ef63df
Author: Daniel J Walsh <dwalsh@redhat.com>
Date: Sat Aug 31 06:25:52 2019 -0400
Merge pull request #68 from agners/master
Makefile: don't fail if clean is called without a build
commit 6ef63dfcc65d5401bc7cc7170d569cefcdadcb38
Author: Stefan Agner <stefan@agner.ch>
Date: Fri Aug 30 17:49:22 2019 +0200
Makefile: don't fail if clean is called without a build
Do not fail when calling the clean target without building first.
Signed-off-by: Stefan Agner <stefan@agner.ch>
commit 8a56404fa7759f4901cf989e60d31c1e04af53db
Merge: af8e5a6 6d4f502
Author: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Tue Aug 20 16:33:23 2019 +0200
Merge pull request #66 from openSUSE/clang-fix
Fix compilation with clang
commit 6d4f5022ac36e69e0cad9dd7fc4bddea8af9d77e
Author: Sascha Grunert <sgrunert@suse.com>
Date: Tue Aug 20 15:27:38 2019 +0200
Fix compilation with clang
This fixes the missing field initializers error when compiling with
clang:
```
src/conmon.c:119:7: error: missing field 'short_name' initializer
{NULL}};
^
```
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
commit af8e5a6bc82868d4346210ffeb462768cc6a18a6
Merge: a1cdfff 74da3fb
Author: Daniel J Walsh <dwalsh@redhat.com>
Date: Mon Aug 19 10:25:01 2019 -0400
Merge pull request #65 from giuseppe/conmon-return-exit-code-container
conmon: propagate error code from the container
commit 74da3fb06d4444aca4724bddc8e61729600a4d81
Author: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Mon Aug 19 13:34:13 2019 +0200
conmon: propagate error code from the container
at exit propagate the return code from the watched container. This is
useful when running in systemd so it can properly detect a failure and
restart the container if necessary.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
commit a1cdfff60be1eb457d2d0e4a631c39e454197c1c
Author: Peter Hunt <pehunt@redhat.com>
Date: Fri Aug 9 09:50:56 2019 -0400
v2.0.1-dev
Signed-off-by: Peter Hunt <pehunt@redhat.com>
commit 9503e2e213a41a79adbcf85d7be16d3b7e87a935
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Date: Thu Jan 16 20:37:49 2020 +1100
Added myself to Uploaders
commit 678d054bd1a685121c21ead1d361054f9395c968
Merge: 8aef65a 87de191
Author: Jamie Bliss <jamie@ivyleav.es>
Date: Sat Dec 21 18:03:27 2019 +0000
Merge branch 'pages-publish' into 'master'
Publish packages to pages
See merge request podman-team/conmon!2
commit 8aef65a40063a8f144ba9ddb936651adc624aa0c
Author: Nicolas Braud-Santoni <nicoo@debian.org>
Date: Wed Oct 30 12:37:20 2019 +0100
Prepare upload v2.0.2-1
commit ca295cd183aae15d081806fdd58b0700ae75b0aa
Merge: 2fab0d6 1cf76db
Author: Nicolas Braud-Santoni <nicoo@debian.org>
Date: Wed Oct 30 12:30:52 2019 +0100
Merge MR!1: Update maintainership information
commit 2fab0d67d0b1a72192ef870b8bcbea01364365df
Author: Nicolas Braud-Santoni <nicoo@debian.org>
Date: Wed Oct 30 12:30:18 2019 +0100
Declare compliance with policy v4.4.1
No change required
commit 73c0dcfe97cabcd7f0a726f3f131fb6acfe089b3
Merge: c6cacc6 66eb2d3
Author: Nicolas Braud-Santoni <nicoo@debian.org>
Date: Wed Oct 30 11:32:01 2019 +0100
Update upstream source from tag 'v2.0.2'
Update to upstream version '2.0.2'
with Debian dir 0a15b7e04269764fd5ffed289ee9f744d001fb39
commit 66eb2d3180638dd7c899bdafff2ced39afc34dbd
Author: Nicolas Braud-Santoni <nicoo@debian.org>
Date: Wed Oct 30 11:32:01 2019 +0100
New upstream version 2.0.2
commit 87de191e9c314300041a084e814202d8ad9e53ad
Author: Jamie Bliss <jamie@ivyleav.es>
Date: Sat Aug 17 11:34:36 2019 -0400
Re-enable publish step
commit 038c7ebe0e1d502d3ea968207e68ed3f9f75d989
Author: Jamie Bliss <jamie@ivyleav.es>
Date: Sat Aug 17 11:21:03 2019 -0400
ci: Ok? I guess it doesn't like bools?
commit c86cecc3dd752e55c73506f86f47a326fd7a86b6
Author: Jamie Bliss <jamie@ivyleav.es>
Date: Sat Aug 17 11:14:51 2019 -0400
Enable aptly
commit c0f1c5cbcea9822d3c8f94d705ee2114609edf99
Author: Jamie Bliss <jamie@ivyleav.es>
Date: Sat Aug 17 11:08:59 2019 -0400
Let auto salsa handle things
commit 71488354137a06cdbb15dd45a6bb6feb54d34fe4
Merge: 3b181db c6cacc6
Author: Jamie Bliss <jamie@ivyleav.es>
Date: Sat Aug 17 11:04:47 2019 -0400
Merge remote-tracking branch 'origin/master' into pages-publish
commit 1cf76db3668170b9368d13c70a8cf2f2ef11a048
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Mon Jun 24 19:39:32 2019 -0700
debian/control: Add Birger to Uploaders
commit c29ea0b4a246192948d4fcfa0ccc1a113c461432
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Sat Jun 22 14:04:44 2019 -0700
debian/control: Update maintainership information
commit c6cacc64ff158d0e5812ba9728bb26bcff501ecd
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Sat Aug 17 12:19:04 2019 +0200
Prepare upload v2.0.0-1
commit 5dd4b9837b7ee7b1a35548e9c70937602cc7db43
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Sat Aug 17 12:16:10 2019 +0200
debian/control: Declare compliance with policy v4.4.0
No change required.
commit 1ad4337fe242cccff27c9a06d578b22bab75ddae
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Sat Aug 17 12:14:26 2019 +0200
debian/rules: Install upstream's changelog
commit 40a96fea62819c8ca590fc6195aa16b3076c5899
Merge: 91db249 e217fdf
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Sat Aug 17 12:11:41 2019 +0200
Merge upstream release v2.0.0
commit 91db24939854c54b6c873c639a1d828df131412c
Merge: d758156 0f4c122
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Sat Aug 17 12:02:19 2019 +0200
Merge branch 'birger'
commit 3b181db6a45c38a892f17e18661c88d250fe8abe
Author: Jamie Bliss <jamie@ivyleav.es>
Date: Tue Jun 25 01:22:24 2019 -0400
Kinda redo everything
commit 8513aaf041ae1c39cebdae780a567cff409fa6c1
Author: Jamie Bliss <jamie@ivyleav.es>
Date: Sat Jun 22 17:40:40 2019 -0400
Publish packages to pages
commit 0f4c12240f5d7fc5c791f0bfc5585d3d3d8f42b3
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Mon Jun 24 19:38:35 2019 -0700
debian/copyright: Add Birger as a copyright holder for the packaging
commit 7ce7f048e238726930572c3c5ef432a05cc2ef1a
Author: Birger Schacht <birger@rantanplan.org>
Date: Mon Jun 24 19:37:19 2019 -0700
debian/upstream: Add metadata
commit 7e8266ae8c5dc0be1d2e77c2f5e3d62e9e41b441
Author: Birger Schacht <birger@rantanplan.org>
Date: Mon Jun 24 19:35:45 2019 -0700
debian/rules: Make build flags work with upstream's Makefile
commit 8373ae2e3db2f55eb834587f6c5d6004693cb236
Author: Birger Schacht <birger@rantanplan.org>
Date: Mon Jun 24 19:32:12 2019 -0700
debian/control: Set `Rules-Requires-Root` to `no`
commit adef433c8f83d0952a62f27931f2cb457adcb140
Author: Birger Schacht <birger@rantanplan.org>
Date: Mon Jun 24 19:29:13 2019 -0700
CI: Automatically use configuration from salsa-ci-team
commit d7581567db99c3f8b9ba6dc07c892e9a01679034
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Sat Jun 22 14:07:20 2019 -0700
salsa.d.o: Set up Continuous Integration for the package
commit 511e5fe22399bbd2870bdc87bfd6ee2851e407b8
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Fri Jun 21 23:16:22 2019 -0700
Prepare upload v0.3.0-1
commit b1fd47a9a12b9c71c5801fe13608f45ada213227
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Fri Jun 21 23:01:47 2019 -0700
fixup! debian/control: Minor fixes
commit 06c1fb245811c362bc1de95e558180fc9bf7fbfe
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Fri Jun 21 22:58:45 2019 -0700
fixup! debian/rules: Install to /usr/libexec/podman
commit f750164c3279fbd8dc09ff2e9e19b165de14cd57
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Fri Jun 21 22:56:38 2019 -0700
Override false-positives from Lintian (this isn't a Go package)
commit 91379e0b49000896124c9e3520d41a7dba952df8
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Fri Jun 21 22:56:16 2019 -0700
debian/control: Minor fixes
commit 4de7d959aee5dbe47d8b3b26e9c087eea568833f
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Fri Jun 21 22:47:18 2019 -0700
debian/rules: Install to /usr/libexec/podman
conmon is currently only ever used by podman, which expects it in this location.
commit d489c2a25d95587715f788d99ebd29e4a97722a9
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Fri Jun 21 22:44:51 2019 -0700
debian/rules: Workaround upstream's `clean` target being broken
commit 3fe398570644aee2244fd4d11bddcc12d176da20
Author: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Fri Jun 21 22:39:02 2019 -0700
Initial packaging
