[Piuparts-devel] [Git][debian/piuparts][ptmx] 5 commits: Fix relative width for overview images
Mathieu Parent
gitlab at salsa.debian.org
Thu Oct 18 20:08:49 BST 2018
Mathieu Parent pushed to branch ptmx at Debian / piuparts
Commits:
6749f0c6 by Holger Levsen at 2018-10-18T11:19:25Z
Fix relative width for overview images
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
d4b3883c by Holger Levsen at 2018-10-18T11:29:40Z
document the complicated update frequencies
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
a557e533 by Holger Levsen at 2018-10-18T11:31:35Z
drop parenthesises
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
d7793dfd by Holger Levsen at 2018-10-18T13:18:51Z
htdocs/news.tpl: confirm #582630 has been fixed.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
acfa47e1 by Mathieu Parent at 2018-10-18T19:07:40Z
Create /dev/ptmx like debootstrap does (Closes: #911334)
When using piuparts on a chroot without /dev/ptmx [noptmx],
scripts/pre_remove_50_find_bad_permissions fails with:
ERROR: BAD PERMISSIONS
crw-rw-rw-. 1 root root 5, 2 Oct 16 03:49 /dev/ptmx
In this case, piuparts does something like this:
touch /dev/ptmx
mount -o bind /dev/pts/ptmx /dev/ptmx
The kernel doc [devpts.txt] recommends instead:
mknod /dev/ptmx c 5 2
And this is what debootstrap does [debootstrap].
This change maps the piuparts behavior with debootstrap's.
[noptmx]: This is the case when chroot comes from the debian:unstable Docker image
[devpts.txt]: https://www.kernel.org/doc/Documentation/filesystems/devpts.txt
[debootstrap] https://salsa.debian.org/installer-team/debootstrap/blob/6f3f6f8b76e2d1a24ddbf05f065439412c3b81a1/functions#L1263-1268, introduced by https://salsa.debian.org/installer-team/debootstrap/commit/c997b80c064c6c1d36ec69da1850722f795f43e4
- - - - -
7 changed files:
- conf/crontab-master.in
- debian/changelog
- htdocs/index.tpl
- htdocs/news.tpl
- known_problems/logrotate_error_after_removal_error.conf
- piuparts-report.py
- piuparts.py
Changes:
=====================================
conf/crontab-master.in
=====================================
@@ -10,7 +10,7 @@ PYTHONPATH=@libdir@/python2.7/dist-packages
@reboot master_cleanup
#
-# generate reports twice a day
+# generate reports twice or three times a day
# (dinstall runs 1|7|13|19:52, so this is long after mirror pushes...)
#
0 4-23/12 * * * piuparts-analyze
@@ -24,7 +24,7 @@ PYTHONPATH=@libdir@/python2.7/dist-packages
0 3,15 * * * reschedule_oldest_logs
#
-# monitor for problems once a day
+# monitor for problems several times day
# - these may result in packages being retested
# - if that's not the case, run them from within generate_daily_report
#
=====================================
debian/changelog
=====================================
@@ -44,6 +44,15 @@ piuparts (0.93) UNRELEASED; urgency=medium
branch. Explain to always include a debian/changelog entry with patches.
Explain to always test patches and to explain that testing has happened.
* htdocs/bug_howto.tpl: some improvements, it's been some years.
+ * htdocs/news.tpl: confirm #582630 has been fixed.
+
+ [ Mathieu Parent ]
+ * Create /dev/ptmx like debootstrap does (Closes: #911334): When the chroot is
+ created from the Docker image debian:unstable, /dev/ptmx is missing.
+ Piuparts was creating it with a bindmount to ptx/ptmx which leads
+ scripts/pre_remove_50_find_bad_permissions to complain about
+ "BAD PERMISSIONS" on /dev/ptmx. Now created with mknod, failing back to a
+ symlink
-- Holger Levsen <holger at debian.org> Sat, 22 Sep 2018 15:32:55 +0200
=====================================
htdocs/index.tpl
=====================================
@@ -59,7 +59,7 @@
</tr>
<tr class="normalrow">
<td class="contentcell2">
- These pages are updated twice a day.
+ These pages are updated two to three times a day.
</td>
</tr>
<tr class="normalrow">
=====================================
htdocs/news.tpl
=====================================
@@ -12,7 +12,7 @@
</tr>
<tr class="normalrow">
<td class="contentcell2">
- <b>2018-08-28</b>: Enable the logrotate test (temporarily) again, to check whether <a href="https://bugs.debian.org/582630" target="_blank">#582630</a> really has been fixed...
+ <b>2018-08-28</b>: Enable the logrotate test again to confirm <a href="https://bugs.debian.org/582630" target="_blank">#582630</a> has been fixed.
</td>
</tr>
<tr class="normalrow">
=====================================
known_problems/logrotate_error_after_removal_error.conf
=====================================
@@ -7,6 +7,6 @@ ISSUE=0
HEADER='Packages with failed logs because a logrotate script has output and/or exits with error after the package has been removed'
HELPTEXT='
<p>
-Most of these packages are probably not buggy but rather affected by <a href="https://bugs.debian.org/582630" target=_blank>#582630</a>. It is being considered to disable this check...
+The logrotate configuration cause output and/or exit with error when the package has been removed but not purged.
</p>
'
=====================================
piuparts-report.py
=====================================
@@ -123,7 +123,7 @@ HTML_HEADER = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<tr class="normalrow">
<td class="contentcell">
<a href="$doc_root/bug_howto.html">How to file bugs</a><br />
- (using <a href="$doc_root/templates/mail/">templates</a>)
+ using <a href="$doc_root/templates/mail/">templates</a>
</td>
</tr>
<tr class="normalrow">
@@ -1872,7 +1872,7 @@ def main():
counter = 0
for section in section_names:
counter += 1
- rows += ("<td><a href=\"/%s/\"><img src=\"/%s/states.png\" width=\"24%%\" alt=\"Binary package states in %s\"></a></td>") % \
+ rows += ("<td><a href=\"/%s/\"><img src=\"/%s/states.png\" width=\"99%%\" alt=\"Binary package states in %s\"></a></td>") % \
(section, section, section)
if counter % 4 == 0:
rows += "</tr><tr>"
=====================================
piuparts.py
=====================================
@@ -1755,11 +1755,11 @@ class Chroot:
os.symlink("../proc/mounts", etcmtab)
self.mount("devpts", "/dev/pts", fstype="devpts", opts="newinstance,noexec,nosuid,gid=5,mode=0620,ptmxmode=0666")
dev_ptmx_rel_path = self.relative("dev/ptmx")
- if not os.path.islink(dev_ptmx_rel_path):
- if not os.path.exists(dev_ptmx_rel_path):
- with open(dev_ptmx_rel_path, 'w'):
- pass
- self.mount(self.relative("dev/pts/ptmx"), "/dev/ptmx", opts="bind", no_mkdir=True)
+ if not os.path.exists(dev_ptmx_rel_path):
+ try:
+ os.mknod(dev_ptmx_rel_path, 0666 | stat.S_IFCHR, os.makedev(5, 2))
+ except:
+ os.symlink("pts/ptmx", dev_ptmx_rel_path)
p = subprocess.Popen(["tty"], stdout=subprocess.PIPE)
stdout, _ = p.communicate()
current_tty = stdout.strip()
View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/943966875a9107bb37815510a690415c91bd0fc4...acfa47e1b7e0958d74dfce35602c0d53fe99e727
--
View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/943966875a9107bb37815510a690415c91bd0fc4...acfa47e1b7e0958d74dfce35602c0d53fe99e727
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20181018/b6eee870/attachment-0001.html>
More information about the Piuparts-devel
mailing list