Bug#813121: qeth: layer2 and portno are not substituted in template
Package: s390-netdevice
Version: 0.0.39
Severity: minor
Tags: d-i patch
Hi,
the layer2 and portno settings for qeth devices are not substituted
in the "qeth/confirm" template. Below is a patch that calls
debconf_subst() to insert the specified settings for confirmation by
the user.
Thanks and kind regards,
Hendrik
>From 6a73bf95b59885fb484569ac2439057c3a90cbd4 Mon Sep 17 00:00:00 2001
From: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Date: Fri, 20 Nov 2015 14:18:12 +0100
Subject: [PATCH 1/3] qeth: substitute layer and port number in qeth/confirm
template
The layer and relative port number variables are not substitued for
the "qeth/confirm" dialog. Hence, call debconf_subst() to provide
this information to the user.
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
---
netdevice.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/netdevice.c b/netdevice.c
index 6905c2d..b8512fb 100644
--- a/netdevice.c
+++ b/netdevice.c
@@ -541,7 +541,11 @@ static enum state_wanted confirm_qeth (void)
const char *template = TEMPLATE_PREFIX "qeth/confirm";
int ret;
char *ptr;
+ char *layer2 = device_current->qeth.layer2 ? "yes" : "no";
+ char *portno = device_current->qeth.port ? "1" : "0";
+ debconf_subst (client, template, "layer2", layer2);
+ debconf_subst (client, template, "port", portno);
debconf_subst (client, template, "device0", device_current->qeth.channels[0]->name);
debconf_subst (client, template, "device1", device_current->qeth.channels[1]->name);
debconf_subst (client, template, "device2", device_current->qeth.channels[2]->name);
--
2.7.0.rc3
Reply to: