kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zipl: show whether we're installed LD ipl or dump

Browse Source 
Let the user know whether we're going to install a
list-directed IPL or dump.

Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Acked-by: Eduard Shishkin <edward6@linux.ibm.com>
Acked-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
This commit is contained in:
Sven Schnelle
2023-04-20 13:27:39 +00:00
committed by Steffen Eiden
parent c8e989840f
commit e496e9862c
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zipl/include/disk.h
View File

@@ -102,7 +102,7 @@ int disk_get_info_from_file(const char* filename,
struct disk_info** info);
void disk_free_info(struct disk_info* info);
char* disk_get_type_name(disk_type_t type);
char *disk_get_ipl_type(disk_type_t type);
char *disk_get_ipl_type(disk_type_t type, int is_dump);
int disk_is_large_volume(struct disk_info* info);
int disk_cyl_from_blocknum(blocknum_t blocknum, struct disk_info* info);
int disk_head_from_blocknum(blocknum_t blocknum, struct disk_info* info);

4
zipl/src/disk.c
View File

@@ -841,7 +841,7 @@ disk_get_type_name(disk_type_t type)
}
/* Return IPL types supported for a given disk TYPE */
char *disk_get_ipl_type(disk_type_t type)
char *disk_get_ipl_type(disk_type_t type, int is_dump)
{
switch (type) {
case disk_type_scsi:
@@ -850,7 +850,7 @@ char *disk_get_ipl_type(disk_type_t type)
case disk_type_eckd_ldl:
return "CCW-";
case disk_type_eckd_cdl:
return "CCW- and LD-";
return is_dump ? "LD-" : "CCW- and LD-";
default:
return "";
}

6
zipl/src/install.c
View File

@@ -345,8 +345,10 @@ int install_bootloader(struct job_data *job, struct install_set *bis)
int fd, rc;
/* Inform user about what we're up to */
printf("Preparing boot device for %sIPL: ",
disk_get_ipl_type(info->type));
printf("Preparing boot device for %s%s: ",
disk_get_ipl_type(info->type,
job->id == job_dump_partition),
job->id == job_dump_partition ? "dump" : "IPL");
if (info->name) {
printf("%s", info->name);
if (info->devno >= 0)