Bug#1036728: unblock: fai/6.0.3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package fai
I've added a small patch, which prevents overwriting a variable
with an empty value. Now we only write if the variable is not empty.
The PR for this says: do not write an (always empty) SERVER= line to bootlog
debian/changelog | 7 +++++++
lib/get-boot-info | 4 +++-
2 files changed, 10 insertions(+), 1 deletion(-)
[ Reason ]
>From the PR:
when i dug around a little it appears that the problem is in the
setnet function of /usr/lib/fai/get-boot-info. it looks like commit
6e1cbda removed the line in setnet where $SERVER was previously
defined but left in the bit where the (now empty) variable is written
to boot.log (which is consumed later). if i remove that leftover line
fai reports the expected/desired:
[ Impact ]
[ Tests ]
I've reviewed the code change.
[ Risks ]
No risks expected.
[ Checklist ]
[X] all changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in testing
unblock fai/6.0.3
diff -Nru fai-6.0.2/debian/changelog fai-6.0.3/debian/changelog
--- fai-6.0.2/debian/changelog 2023-05-07 17:25:35.000000000 +0200
+++ fai-6.0.3/debian/changelog 2023-05-24 11:57:11.000000000 +0200
@@ -1,3 +1,10 @@
+fai (6.0.3) unstable; urgency=high
+
+ * get-boot-info: write $SERVER only if string is non-epmty
+ fixes https://github.com/faiproject/fai/pull/118
+
+ -- Thomas Lange <lange@debian.org> Wed, 24 May 2023 11:57:11 +0200
+
fai (6.0.2) unstable; urgency=high
[ Thomas Lange ]
diff -Nru fai-6.0.2/lib/get-boot-info fai-6.0.3/lib/get-boot-info
--- fai-6.0.2/lib/get-boot-info 2022-11-13 00:32:00.000000000 +0100
+++ fai-6.0.3/lib/get-boot-info 2023-05-24 11:56:44.000000000 +0200
@@ -86,9 +86,11 @@
IPADDR=$IPADDR
CIDR=$CIDR
GATEWAYS=$GATEWAYS
- SERVER=$SERVER
EOF
fi
+ if [ -n "$SERVER" ]; then
+ echo "SERVER=$SERVER" >> $bootlog
+ fi
if [ -n "$DOMAIN" ]; then
# DOMAIN was specified on the kernel command line
Reply to: