Package: release.debian.org
Severity: normal
Tags: jessie
User: [email protected]
Usertags: pu
I'd like to update s390-dasd 0.0.32 from stretch to sid, as
0.0.32~deb8u1. The debdiff is attached. It fixes installation of Debian
within KVM on System z and within full-system emulation using qemu.
The critical hunk is this:
@@ -233,7 +235,8 @@
return get_channel_input ();
else if (di_tree_size (channels) > 0)
return get_channel_select ();
- return WANT_ERROR;
+ di_info("s390-dasd: no channel found");
+ return WANT_FINISH;
}
This lets s390-dasd exit cleanly if no DASD disks are found. Within qemu
virtio is used to provide disks, which is totally different from what
traditionally used to happen on the mainframe.
The remaining changes are .po updates, mainly in the comments, and
the logging of the various error conditions s390-dasd emits. Without
the logging you cannot deduce why it exited with a failure.
I'm also happy to skip the .po changes if needed, but it seemed cleaner
to just backport stretch's current version.
Kind regards and thanks
Philipp Kern
diff -Nru s390-dasd-0.0.30/dasd-config.c s390-dasd-0.0.32/dasd-config.c
--- s390-dasd-0.0.30/dasd-config.c 2013-12-04 00:53:16.000000000 +0100
+++ s390-dasd-0.0.32/dasd-config.c 2015-11-01 22:37:03.000000000 +0100
@@ -1,4 +1,5 @@
#include <ctype.h>
+#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
@@ -224,6 +225,7 @@
channel_current = di_tree_lookup (channels, &dev);
if (channel_current)
return WANT_NEXT;
+ di_error("s390-dasd: could not get selected channel device %d", dev);
return WANT_ERROR;
}
@@ -233,7 +235,8 @@
return get_channel_input ();
else if (di_tree_size (channels) > 0)
return get_channel_select ();
- return WANT_ERROR;
+ di_info("s390-dasd: no channel found");
+ return WANT_FINISH;
}
static enum state_wanted enable (void)
@@ -242,14 +245,23 @@
struct sysfs_attribute *attr;
device = sysfs_open_device ("ccw", channel_current->name);
- if (!device)
+ if (!device) {
+ di_error("s390-dasd: could not open device %s",
+ channel_current->name);
return WANT_ERROR;
+ }
attr = sysfs_get_device_attr (device, "online");
- if (!attr)
+ if (!attr) {
+ di_error("s390-dasd: could not read online attribute for %s",
+ channel_current->name);
return WANT_ERROR;
- if (sysfs_write_attribute (attr, "1", 1) < 0)
+ }
+ if (sysfs_write_attribute (attr, "1", 1) < 0) {
+ di_error("s390-dasd: could not set %s online: %s",
+ channel_current->name, strerror(errno));
return WANT_ERROR;
+ }
sysfs_close_device (device);
diff -Nru s390-dasd-0.0.30/debian/changelog s390-dasd-0.0.32/debian/changelog
--- s390-dasd-0.0.30/debian/changelog 2014-03-14 22:59:51.000000000 +0100
+++ s390-dasd-0.0.32/debian/changelog 2015-11-01 22:59:19.000000000 +0100
@@ -1,3 +1,18 @@
+s390-dasd (0.0.32) unstable; urgency=medium
+
+ * If no channel is found, exit cleanly. This allows s390-dasd to step
+ out of the way on VMs with virtio disks.
+ * Log error conditions.
+
+ -- Philipp Kern <[email protected]> Sun, 01 Nov 2015 22:59:11 +0100
+
+s390-dasd (0.0.31) unstable; urgency=medium
+
+ [ Updated translations ]
+ * Turkish (tr.po) by Mert Dirik
+
+ -- Christian Perrier <[email protected]> Sun, 26 Jul 2015 09:15:33 +0200
+
s390-dasd (0.0.30) unstable; urgency=low
[ Dmitrijs Ledkovs ]
diff -Nru s390-dasd-0.0.30/debian/po/be.po s390-dasd-0.0.32/debian/po/be.po
--- s390-dasd-0.0.30/debian/po/be.po 2013-12-04 00:53:16.000000000 +0100
+++ s390-dasd-0.0.32/debian/po/be.po 2015-05-23 19:12:43.000000000 +0200
@@ -11,11 +11,13 @@
# Nasciona Piatrouskaja <[email protected]>, 2006.
# Paul Petruk <[email protected]>, 2007.
# Pavel Piatruk <[email protected]>, 2008, 2009, 2011.
-# Viktar Siarheichyk <[email protected]>, 2010, 2011, 2012.
+# Viktar Siarheichyk <[email protected]>, 2010, 2011, 2012, 2015.
# Translations from iso-codes:
# Alastair McKinstry <[email protected]>, 2004.
# Alexander Nyakhaychyk <[email protected]>, 2009.
# Ihar Hrachyshka <[email protected]>, 2007, 2010.
+# Viktar Siarheichyk <viс[email protected]>, 2014.
+# Viktar Siarheichyk <[email protected]>, 2014, 2015.
msgid ""
msgstr ""
"Project-Id-Version: be\n"
@@ -23,8 +25,7 @@
"POT-Creation-Date: 2010-03-30 23:19+0000\n"
"PO-Revision-Date: 2010-07-06 01:58+0300\n"
"Last-Translator: Viktar Siarheichyk <[email protected]>\n"
-"Language-Team: Belarusian (Official spelling) <debian-l10n-belarusian@lists."
-"debian.org>\n"
+"Language-Team: Belarusian <[email protected]>\n"
"Language: be\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff -Nru s390-dasd-0.0.30/debian/po/et.po s390-dasd-0.0.32/debian/po/et.po
--- s390-dasd-0.0.30/debian/po/et.po 2013-12-04 00:53:16.000000000 +0100
+++ s390-dasd-0.0.32/debian/po/et.po 2015-02-08 11:42:16.000000000 +0100
@@ -24,7 +24,7 @@
# Margus Väli <[email protected]>, 2000.
# Siim Põder <[email protected]>, 2006.
# Tõivo Leedjärv <[email protected]>, 2000, 2001, 2008.
-# Mattias Põldaru <[email protected]>, 2009-2011, 2012.
+# Mattias Põldaru <[email protected]>, 2009-2012, 2014.
#
msgid ""
msgstr ""
@@ -37,7 +37,7 @@
"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#. Type: select
diff -Nru s390-dasd-0.0.30/debian/po/it.po s390-dasd-0.0.32/debian/po/it.po
--- s390-dasd-0.0.30/debian/po/it.po 2013-12-04 00:53:16.000000000 +0100
+++ s390-dasd-0.0.32/debian/po/it.po 2014-08-29 06:40:54.000000000 +0200
@@ -4,7 +4,7 @@
# DO NOT MODIFY THIS FILE DIRECTLY: SUCH CHANGES WILL BE LOST
#
# Italian messages for debian-installer.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Software in the Public Interest, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2103, 2014 Software in the Public Interest, Inc.
# This file is distributed under the same license as debian-installer.
# The translation team (for all four levels):
# Cristian Rigamonti <[email protected]>
@@ -13,7 +13,7 @@
# Davide Viti <[email protected]>
# Filippo Giunchedi <[email protected]>
# Giuseppe Sacco <[email protected]>
-# Lorenzo 'Maxxer' Milesi
+# Lorenzo 'Maxxer' Milesi
# Renato Gini
# Ruggero Tonelli
# Samuele Giovanni Tonon <[email protected]>
@@ -32,21 +32,21 @@
# Marcello Raffa <[email protected]>, 2001
# Tobias Toedter <[email protected]>, 2007.
# Translations taken from ICU SVN on 2007-09-09
-# Milo Casagrande <[email protected]>, 2008, 2009, 2010, 2011.
+# Milo Casagrande <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: debian-installer\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2010-03-30 23:19+0000\n"
-"PO-Revision-Date: 2011-08-21 18:53+0200\n"
-"Last-Translator: Milo Casagrande <[email protected]>\n"
+"PO-Revision-Date: 2010-10-27 07:25-0400\n"
+"Last-Translator: Milo Casagrande <[email protected]>\n"
"Language-Team: Italian <[email protected]>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#. Type: select
#. Choices
diff -Nru s390-dasd-0.0.30/debian/po/tr.po s390-dasd-0.0.32/debian/po/tr.po
--- s390-dasd-0.0.30/debian/po/tr.po 2013-12-04 00:53:16.000000000 +0100
+++ s390-dasd-0.0.32/debian/po/tr.po 2015-09-19 15:56:26.000000000 +0200
@@ -6,27 +6,37 @@
# Turkish messages for debian-installer.
# Copyright (C) 2003, 2004 Software in the Public Interest, Inc.
# This file is distributed under the same license as debian-installer.
-#
# Recai Oktaş <[email protected]>, 2004, 2005, 2008.
# Osman Yüksel <[email protected]>, 2004.
# Özgür Murat Homurlu <[email protected]>, 2004.
# Halil Demirezen <[email protected]>, 2004.
# Murat Demirten <[email protected]>, 2004.
-#
-# Mert Dirik <[email protected]>, 2008, 2009.
+# Mert Dirik <[email protected]>, 2008-2012, 2014.
+# Translations from iso-codes:
+# Alastair McKinstry <[email protected]>, 2001.
+# (translations from drakfw)
+# Fatih Demir <[email protected]>, 2000.
+# Free Software Foundation, Inc., 2000,2004
+# Kemal Yilmaz <[email protected]>, 2001.
+# Mert Dirik <[email protected]>, 2008, 2014.
+# Nilgün Belma Bugüner <[email protected]>, 2001.
+# Recai Oktaş <[email protected]>, 2004.
+# Tobias Quathamer <[email protected]>, 2007.
+# Translations taken from ICU SVN on 2007-09-09
+# Ömer Fadıl USTA <[email protected]>, 1999.
msgid ""
msgstr ""
"Project-Id-Version: debian-installer\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2010-03-30 23:19+0000\n"
-"PO-Revision-Date: 2010-10-29 17:13+0200\n"
+"PO-Revision-Date: 2015-06-30 01:49+0200\n"
"Last-Translator: Mert Dirik <[email protected]>\n"
-"Language-Team: Debian L10n Turkish <[email protected]>\n"
-"Language: \n"
+"Language-Team: Debian L10N Turkish\n"
+"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. Type: select
#. Choices
diff -Nru s390-dasd-0.0.30/debian/po/zh_CN.po s390-dasd-0.0.32/debian/po/zh_CN.po
--- s390-dasd-0.0.30/debian/po/zh_CN.po 2013-12-04 00:53:16.000000000 +0100
+++ s390-dasd-0.0.32/debian/po/zh_CN.po 2015-02-08 11:42:16.000000000 +0100
@@ -39,7 +39,7 @@
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#. Type: select
