consolidated s390 device configuration #1259
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Jenkins, test this please. |
vojtechtrefny
force-pushed
the
3.10-devel_zdev
branch
from
408c54f
to
6accb6c
Compare
|
Thanks for your rebase. |
…RHEL6 Signed-off-by: Steffen Maier <[email protected]>
The old existing test preceding the removed code was only designed for the old zfcp before it got automatic LUN scan. Hence, the test is incomplete. With zfcp auto LUN scan, zfcp can just have SCSI devices without any zfcp unit representation in sysfs. Do not bother cleaning up an unused FCP device and just remove the code. Note: Do not confuse zfcp auto port scan with zfcp auto LUN scan. Signed-off-by: Steffen Maier <[email protected]>
Gone since 2008 Linux kernel v2.6.27 commit 235f7f25f492 ("[SCSI] zfcp:
Remove sysfs attribute port_add").
Signed-off-by: Steffen Maier <[email protected]>
…(#1802482,#1937049) Implements the zfcp part of referenced bugs. https://github.com/ibm-s390-linux/s390-tools/tree/master/zdev/ handles everything as of ibm-s390-linux/s390-tools@06a30ae ("zdev/dracut: add rd.zfcp cmdline option handling"). It is no longer necessary to perform individual pre-req steps, such as setting an FCP device online, when we want to attach a LUN. Just call chzdev to configure zfcp LUNs and let it do what is necessary, including cio_ignore handling and udev settle. The spec file update reflects the new dependency on `chzdev` from the s390 architecture specific sub-package s390utils-core. Actually, this commit here only depends on `chzdev` in older versions already packaged and shipped, so no version comparison necessary here. Since chzdev now implicitly sets the FCP device online and there is no more preceding explicit FCP device online, move the path over-specification warning after the call to chzdev. Otherwise, the FCP device could still be offline and its port_type unknown, so has_auto_lun_scan() would get wrong information regarding the port_type being NPIV. Anaconda handles the persistent config of all s390 device types as of commit ("write persistent config of any (dasd,zfcp,znet) s390 devices to sysroot"), so drop the special handling in zfcp.write(). Signed-off-by: Steffen Maier <[email protected]>
…2,#1937049) Implements the zfcp part of referenced bugs. Since rhinstaller/anaconda@87ab1ab ("Support cio_ignore functionality for zFCP devices (#533492)"), /etc/zfcp.conf replaced /tmp/fcpconfig. Since rhinstaller/anaconda@011ea0a ("Remove linuxrc.s390"), /etc/zfcp.conf only exists if the user specified dracut cmdline parameter rd.zfcp=. https://github.com/ibm-s390-linux/s390-tools/tree/master/zdev/ handles parsing of rd.zfcp= without /etc/zfcp.conf as of ibm-s390-linux/s390-tools@06a30ae ("zdev/dracut: add rd.zfcp cmdline option handling"). https://src.fedoraproject.org/rpms/s390utils.git no longer writes /etc/zfcp.conf during deprecated parsing of rd.zfcp= as of commit ("zfcp: migrate to consolidated persistent device config with zdev") Hence, nothing populates /etc/zfcp.conf during installer boot anymore. Anaconda imports configuration for all s390 device types as of commit ("write persistent config of any (dasd,zfcp,znet) s390 devices to sysroot"). The only remaining import source is from dracut boot parameters. Signed-off-by: Steffen Maier <[email protected]>
Complements RHBZ#1937030. Signed-off-by: Steffen Maier <[email protected]>
…2,#1937049) Implements the dasd part of referenced bugs. Depends on ibm-s390-linux/s390-tools@689b894 ("zdev: add helper to convert from zdev config to dasd_mod.dasd"). The spec file update reflects the new dependency on `zdev-to-dasd_mod.dasd` in the new v2.31.0 of the s390 architecture specific sub-package s390utils-core. Delegate the generation of rd.dasd statements to a helper tool from s390-tools, which gets its low-level config information from the consolidated persistent configuration mechanism using chzdev. Signed-off-by: Steffen Maier <[email protected]>
vojtechtrefny
force-pushed
the
3.10-devel_zdev
branch
from
6accb6c
to
7208a0a
Compare
|
Rebased once more to resolve conflict in the spec file. This is ready to be merged as soon as the anaconda PR is merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#1162 rebased to the latest 3.10-devel