<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Wolfgang Schweer pushed to branch master
at <a href="https://salsa.debian.org/debian-edu/debian-edu-config">Debian Edu / debian-edu-config</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/7159e07c7f2bc6f1a1f6c22a312d4ab4105b8587">7159e07c</a></strong>
<div>
<span>by Wolfgang Schweer</span>
<i>at 2020-12-31T19:27:27+01:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Use the Homeworld theme also for syslinux in sbin/debian-edu-pxeinstall
Signed-off-by: Wolfgang Schweer <wschweer@arcor.de>
</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#9c96da0e9f91d7d8937b69b524702c106258f0d1">
debian/changelog
</a>
</li>
<li class="file-stats">
<a href="#7e2575a3822b78ec1d91bd43874b2a79c5a151b3">
sbin/debian-edu-pxeinstall
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="9c96da0e9f91d7d8937b69b524702c106258f0d1">
<a href="https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/7159e07c7f2bc6f1a1f6c22a312d4ab4105b8587#9c96da0e9f91d7d8937b69b524702c106258f0d1"><strong>debian/changelog</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="1" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1
</td>
<td class="diff-line-num new_line" data-linenumber="1" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
1
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC1" class="line" lang="mosel"><span class="n" style="color: #333;">debian</span><span class="p">-</span><span class="n" style="color: #333;">edu</span><span class="p">-</span><span class="n" style="color: #333;">config</span> <span class="p">(</span><span class="m" style="color: #099;">2.11.42</span><span class="p">)</span> <span class="n" style="color: #333;">UNRELEASED</span><span class="p">;</span> <span class="n" style="color: #333;">urgency</span><span class="p">=</span><span class="n" style="color: #333;">medium</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="2" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
2
</td>
<td class="diff-line-num new_line" data-linenumber="2" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
2
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC2" class="line" lang="mosel"></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="3" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="3" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
3
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC3" class="line" lang="mosel"><span class="p">..*</span> <span class="n" style="color: #333;">sbin</span><span class="p">/</span><span class="n" style="color: #333;">debian</span><span class="p">-</span><span class="n" style="color: #333;">edu</span><span class="p">-</span><span class="n" style="color: #333;">pxeinstall</span><span class="p">:</span> <span class="n" style="color: #333;">Use</span> <span class="n" style="color: #333;">the</span> <span class="n" style="color: #333;">Homeworld</span> <span class="n" style="color: #333;">theme</span> <span class="n" style="color: #333;">also</span> <span class="n" style="color: #333;">for</span> <span class="n" style="color: #333;">syslinux</span><span class="p">.</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="3" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
3
</td>
<td class="diff-line-num new_line" data-linenumber="4" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
4
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC4" class="line" lang="mosel"> <span class="p">*</span> <span class="n" style="color: #333;">Drop</span> <span class="n" style="color: #333;">CUPS</span> <span class="n" style="color: #333;">related</span> <span class="n" style="color: #333;">workaround</span> <span class="n" style="color: #333;">now</span> <span class="n" style="color: #333;">that</span> <span class="n" style="color: #333;">bug</span> <span class="p">#</span><span class="m" style="color: #099;">977198</span> <span class="n" style="color: #333;">has</span> <span class="n" style="color: #333;">been</span> <span class="n" style="color: #333;">fixed</span><span class="p">:</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="4" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
4
</td>
<td class="diff-line-num new_line" data-linenumber="5" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
5
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC5" class="line" lang="mosel"> <span class="p">-</span> <span class="n" style="color: #333;">Remove</span> <span class="n" style="color: #333;">share</span><span class="p">/</span><span class="n" style="color: #333;">debian</span><span class="p">-</span><span class="n" style="color: #333;">edu</span><span class="p">-</span><span class="n" style="color: #333;">config</span><span class="p">/</span><span class="n" style="color: #333;">cups</span><span class="p">.</span><span class="n" style="color: #333;">service</span><span class="p">.</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="5" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
5
</td>
<td class="diff-line-num new_line" data-linenumber="6" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
6
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC6" class="line" lang="mosel"> <span class="p">-</span> <span class="n" style="color: #333;">Adjust</span> <span class="n" style="color: #333;">Makefile</span> <span class="k" style="font-weight: 600;">and</span> <span class="n" style="color: #333;">cf3</span><span class="p">/</span><span class="n" style="color: #333;">cf</span><span class="p">.</span><span class="n" style="color: #333;">workarounds</span><span class="p">.</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
<li id="7e2575a3822b78ec1d91bd43874b2a79c5a151b3">
<a href="https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/7159e07c7f2bc6f1a1f6c22a312d4ab4105b8587#7e2575a3822b78ec1d91bd43874b2a79c5a151b3"><strong>sbin/debian-edu-pxeinstall</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="278" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="278" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -278,7 +278,7 @@ EOF</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="278" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
278
</td>
<td class="diff-line-num new_line" data-linenumber="278" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
278
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC278" class="line" lang="shell"><span class="o" style="font-weight: 600;">)</span> <span class="o" style="font-weight: 600;">></span> <span class="nv" style="color: #008080;">$menufile</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="279" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
279
</td>
<td class="diff-line-num new_line" data-linenumber="279" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
279
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC279" class="line" lang="shell"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="280" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
280
</td>
<td class="diff-line-num new_line" data-linenumber="280" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
280
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC280" class="line" lang="shell"><span class="k" style="font-weight: 600;">if </span><span class="nb" style="color: #0086b3;">grep</span> <span class="nt" style="color: #000080;">-q</span> sid /etc/debian_version <span class="p">;</span> <span class="k" style="font-weight: 600;">then</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="281" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
281
</td>
<td class="diff-line-num new_line old" data-linenumber="281" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC281" class="line" lang="shell"><span class="k" style="font-weight: 600;"> </span><span class="nb" style="color: #0086b3;">cp</span> /usr/share/pixmaps/debian-edu-<span class="idiff left right">buster</span>-syslinux.png <span class="nv" style="color: #008080;">$tftpdir</span>/debian-edu/debian-edu-pxe.png</span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="282" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="281" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
281
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC281" class="line" lang="shell"><span class="k" style="font-weight: 600;"> </span><span class="nb" style="color: #0086b3;">cp</span> /usr/share/pixmaps/debian-edu-<span class="idiff left right">homeworld</span>-syslinux.png <span class="nv" style="color: #008080;">$tftpdir</span>/debian-edu/debian-edu-pxe.png</span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="282" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
282
</td>
<td class="diff-line-num new_line" data-linenumber="282" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
282
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC282" class="line" lang="shell"><span class="k" style="font-weight: 600;">else</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="283" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
283
</td>
<td class="diff-line-num new_line" data-linenumber="283" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
283
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC283" class="line" lang="shell"><span class="k" style="font-weight: 600;"> </span><span class="nb" style="color: #0086b3;">cp</span> /usr/share/pixmaps/debian-edu-<span class="nv" style="color: #008080;">$dist</span><span class="nt" style="color: #000080;">-syslinux</span>.png <span class="nv" style="color: #008080;">$tftpdir</span>/debian-edu/debian-edu-pxe.png</span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="284" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
284
</td>
<td class="diff-line-num new_line" data-linenumber="284" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
284
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC284" class="line" lang="shell"><span class="k" style="font-weight: 600;">fi</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #666;">
—
<br>
<a href="https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/7159e07c7f2bc6f1a1f6c22a312d4ab4105b8587">View it on GitLab</a>.
<br>
You're receiving this email because of your account on salsa.debian.org.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/7159e07c7f2bc6f1a1f6c22a312d4ab4105b8587"}}</script>
</p>
</div>
</body>
</html>