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
iSCSI.
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 <email address hidden>
Fix a hang during ethdetect (bug #803769).
Commit 79ddda2d8e51776e8c66ef5b54c7ed0b41a241e3 (ethdetect:
Exclude PHY drivers from list of net drivers) replaced the
list_modules_dir() function with a direct find call, but kept
passing $1 (which is now undefined) as a path specifier to find.
Therefore find runs in the root directory instead of in the
network module directory and delivers wrong data to the following
parts of ethdetect.
Replace $1 in the find call with the actual module directory.
Signed-off-by: Cyril Brulebois <email address hidden>
