mirror of
https://github.com/ibm-s390-linux/s390-tools.git
synced 2026-08-05 02:14:52 +00:00
c0f02d2f68
Steps to reproduce: Prepare some disk for IPL, specifying its parameters via zipl "target options", and an image IMAGE_NAME located on another disk. Don't specify "-a" option. Actual result: Installation succeeded (resulting in unbootable setup) Expected result: "Error: Could not add image file 'IMAGE_NAME': File is not on target device" The problem is in incorrect evaluation of device number (dev_t) of the base disk where the image is located by the function add_component_file_range() in case when target parameters are specified by user. Fixup: Retrieve info of the underlying disk without any user hints, passing zeroed structure job_target_data This is an improved version offb0b6263dthat was reverted by63ff07ba3afterwards. The shortcoming of the original (fb0b6263d) fix: it fails to prepare for IPL mounted qcow2 images. The difference from the original fix: when making sure that boot files are located on the target disk: in case of failed auto-detection of disk parameters skip the check with warnings instead of aborting the whole installation session. Acked-by: Jan Höppner <hoeppner@linux.ibm.com> Signed-off-by: Eduard Shishkin <edward6@linux.ibm.com> Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>