Bug#813030: zipl-installer: remove obsolete portname
Package: zipl-installer
Version: 0.0.38
Severity: minor
Tags: d-i patch
Hi,
this a small patch to remove the portname attribute. The attribute
is obsolete and cannot be changed anymore. Further it will be removed
in a future kernel version.
See also the attached patch.
Thanks and kind regards,
Hendrik
>From 912031a56bb9271a0e8b4bbb90118bb6ae7fc72e Mon Sep 17 00:00:00 2001
From: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Date: Fri, 20 Nov 2015 11:09:23 +0100
Subject: [PATCH 1/4] qeth: remove portname
The portname attribute is no longer necessary and will be removed soon.
See also upstream kernel commit:
commit 239ff408ddd8fa7a19c53ed247daec855ff11ea2
Author: Ursula Braun <ursula.braun@de.ibm.com>
Date: Fri Sep 18 16:06:50 2015 +0200
qeth: move OSA portname into deprecated status
An OSA-Express port name was required to identify a shared OSA port.
All operating system instances that shared the port had to use the
same port name. This requirement no longer applies.
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
---
debian/po/templates.pot | 17 -----------------
debian/s390-netdevice.templates | 15 ---------------
netdevice.c | 28 ++++------------------------
3 files changed, 4 insertions(+), 56 deletions(-)
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index f6bae74..dabf4e2 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -166,7 +166,6 @@ msgid ""
"The configured parameters are:\n"
" channels = ${device0}, ${device1}, ${device2}\n"
" port = ${port}\n"
-" portname = ${portname}\n"
" layer2 = ${layer2}"
msgstr ""
@@ -190,22 +189,6 @@ msgstr ""
#. Description
#. :sl5:
#: ../s390-netdevice.templates:10001
-msgid "Portname:"
-msgstr ""
-
-#. Type: string
-#. Description
-#. :sl5:
-#: ../s390-netdevice.templates:10001
-msgid ""
-"Please enter the portname of your OSA-Express card. This name must be 1 to 8 "
-"characters long and must be equal on all systems accessing the same card."
-msgstr ""
-
-#. Type: string
-#. Description
-#. :sl5:
-#: ../s390-netdevice.templates:10001
msgid ""
"Leave it empty if you want to use HiperSockets. This parameter is required "
"for cards with microcode level 2.10 or later or when you want to share a "
diff --git a/debian/s390-netdevice.templates b/debian/s390-netdevice.templates
index aa641f2..39fc0b7 100644
--- a/debian/s390-netdevice.templates
+++ b/debian/s390-netdevice.templates
@@ -64,7 +64,6 @@ _Description: Do you accept this configuration?
The configured parameters are:
channels = ${device0}, ${device1}, ${device2}
port = ${port}
- portname = ${portname}
layer2 = ${layer2}
Template: s390-netdevice/qeth/no
@@ -74,20 +73,6 @@ _Description: No OSA-Express QDIO cards / HiperSockets
No OSA-Express QDIO cards / HiperSockets were detected. If you are running
VM please make sure that your card is attached to this guest.
-Template: s390-netdevice/qeth/portname
-Type: string
-# :sl5:
-_Description: Portname:
- Please enter the portname of your OSA-Express card. This name must be 1 to
- 8 characters long and must be equal on all systems accessing the same
- card.
- .
- Leave it empty if you want to use HiperSockets. This parameter is
- required for cards with microcode level 2.10 or later or when you want to
- share a card.
- .
- The name will automatically be converted to uppercase.
-
Template: s390-netdevice/qeth/port
Type: string
Default: 0
diff --git a/netdevice.c b/netdevice.c
index a4e1aea..6ddece9 100644
--- a/netdevice.c
+++ b/netdevice.c
@@ -60,7 +60,6 @@ struct device
struct channel *channels[3];
bool layer2;
int port;
- char portname[32];
} qeth;
struct
{
@@ -109,7 +108,6 @@ enum state
GET_QETH_DEVICE,
GET_QETH_LAYER2,
GET_QETH_PORT,
- GET_QETH_PORTNAME,
GET_IUCV_DEVICE,
GET_IUCV_PEER,
CONFIRM_CTC,
@@ -479,27 +477,13 @@ static enum state_wanted get_qeth_port (void)
return WANT_NEXT;
}
-static enum state_wanted get_qeth_portname_iucv_peer (enum state state)
+static enum state_wanted get_iucv_peer (void)
{
- const char *template = NULL;
char *ptr, *tmp;
int ret, i, j;
- switch (state)
- {
- case GET_QETH_PORTNAME:
- template = TEMPLATE_PREFIX "qeth/portname";
- tmp = device_current->qeth.portname;
- break;
- case GET_IUCV_PEER:
- template = TEMPLATE_PREFIX "iucv/peer";
- tmp = device_current->iucv.peername;
- break;
- default:
- return WANT_ERROR;
- }
-
- ret = my_debconf_input ("critical", template, &ptr);
+ tmp = device_current->iucv.peername;
+ ret = my_debconf_input ("critical", TEMPLATE_PREFIX "iucv/peer", &ptr);
if (ret)
return ret;
@@ -779,9 +763,8 @@ int main (int argc __attribute__ ((unused)), char *argv[] __attribute__ ((unused
case GET_QETH_PORT:
state_want = get_qeth_port ();
break;
- case GET_QETH_PORTNAME:
case GET_IUCV_PEER:
- state_want = get_qeth_portname_iucv_peer (state);
+ state_want = get_iucv_peer ();
break;
case CONFIRM_CTC:
state_want = confirm_ctc ();
@@ -858,9 +841,6 @@ int main (int argc __attribute__ ((unused)), char *argv[] __attribute__ ((unused
state = CONFIRM_QETH;
break;
case GET_QETH_PORT:
- state = GET_QETH_PORTNAME;
- break;
- case GET_QETH_PORTNAME:
state = CONFIRM_QETH;
break;
case GET_IUCV_DEVICE:
--
2.7.0.rc3
Reply to: