[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#818586: disk-detect/control: Improve harddrive detection dependency on s390x

Control: tags -1 + patch
>From 131e2f4325e3203e6ac30ffe38005dfe01d96fcc Mon Sep 17 00:00:00 2001
From: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Date: Fri, 18 Mar 2016 11:22:12 +0100
Subject: [PATCH] disk-detect/control: Improve harddrive detection dependency
 on s390x

On Linux on z Systems, there are two major disk storage environments,
the direct-attached storage disk (DASD) and SCSI over Fibre-Channel.

There are the s390-dasd and s390-zfcp d-i modules to configure and
enable DASDs and FCP devices.  Note that on s390x, disks are not
available by default to Linux and must be enabled in advance.

The s390-dasd and s390-zfcp both provide the harddrive-detection
dependency and, thus, each could fulfill the dependency to silenty
ignore the other.  That behavior does not allow to mix DASDs and
SCSI disk on single installation (except you call both manually,
for example, in the expert mode).

To improve and provide a "guided" flow, I have split the harddrive
detection dependency for s390-dasd and s390-zfcp as follows:

- s390-dasd provides harddrive-detection-dasd
- s390-zfcp provides harddrive-detection-zfcp

disk-detect depends on
  -> harddrive-detection-dasd
  -> harddrive-detection-zfcp

and continues to provide the harddrive-detection.

With this split, the guided installation will install disk-detect to
solve the harddrive-detection dependency.  In turn, disk-detect will
then rely on the s390-dasd and s390-zfcp d-i modules to provide DASD
and FC-attached SCSI disks.  If both modules fail, the user perceives
the default disk-detect behavior, for example, users might configure

The other nice benefit of this dependency split is the seamlessly
enablement of multipath with disk-detect (through preseeding).
For s390, multipathing should be always considered when SCSI is used.

Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
 debian/changelog | 8 ++++++++
 debian/control   | 6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 477f23a..1c564fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hw-detect (1.117) UNRELEASED; urgency=medium
+  [ Hendrik Brueckner ]
+  * Improve and split harddrive detection into DASD and SCSI dependency
+    on s390x (Closes: #818586)
+ -- Hendrik Brueckner <brueckner@linux.vnet.ibm.com>  Fri, 18 Mar 2016 11:21:31 +0100
 hw-detect (1.116) unstable; urgency=medium
   [ Colin Watson ]
diff --git a/debian/control b/debian/control
index bf4b663..7c1a8a3 100644
--- a/debian/control
+++ b/debian/control
@@ -24,8 +24,10 @@ Description: Detect network hardware and load kernel drivers for it
 Package: disk-detect
 Package-Type: udeb
-Architecture: all
-Depends: cdebconf-udeb (>= 0.38), hw-detect, di-utils (>= 1.13), pciutils-udeb
+Architecture: any
+Depends: cdebconf-udeb (>= 0.38), hw-detect, di-utils (>= 1.13), pciutils-udeb,
+	 harddrive-detection-dasd [s390x],
+	 harddrive-detection-zfcp [s390x]
 Priority: optional
 Provides: harddrive-detection
 Enhances: hw-detect

Reply to: