mirror of
https://github.com/ibm-s390-linux/s390-tools.git
synced 2026-08-05 02:14:52 +00:00
63ff07ba38
The commitfb0b6263d1("zipl/src: Fix problems when target parameters are specified by user") breaks the case where the user has to provide all target attributes via the zipl command line, because the target device cannot be used to retrieve those attributes. $ zipl -V --blsdir /tmp/tmp.xHmFUdgBCi/boot//loader/entries/ --config /tmp/tmp.dSv9MJ3svs Looking for components in '/lib/s390-tools' Using config file '/tmp/tmp.dSv9MJ3svs' (from command line) Using BLS config file '/tmp/tmp.xHmFUdgBCi/boot//loader/entries//50_normal.conf' Using BLS config file '/tmp/tmp.xHmFUdgBCi/boot//loader/entries//45_normal_swiotlb.conf' Using BLS config file '/tmp/tmp.xHmFUdgBCi/boot//loader/entries//40_pv.conf' Using BLS config file '/tmp/tmp.xHmFUdgBCi/boot//loader/entries//30_pv_reboot.conf' Secure boot support: yes Target device information Device..........................: 2b:00 Device name.....................: nbd0 *) Device driver name..............: nbd Type............................: disk device Disk layout.....................: SCSI disk layout *) Geometry - start................: 2048 *) File system block size..........: 4096 Physical block size.............: 512 *) Device size in physical blocks..: 2095071 *) Data provided by user. Building bootmap in '/tmp/tmp.xHmFUdgBCi/boot/' Building menu 'zipl-automatic-menu' Adding #1: IPL section 'Normal Guest' (default) initial ramdisk...: /tmp/tmp.xHmFUdgBCi/boot//ramdisk-s390x kernel image......: /tmp/tmp.xHmFUdgBCi/boot//vmlinux-s390x zIPL environment block content: Error: Could not add image file '/tmp/tmp.xHmFUdgBCi/boot//vmlinux-s390x': Could not get disk geometry This reverts commitfb0b6263d1. Acked-by: Eduard Shishkin <edward6@linux.ibm.com> Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com> Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>