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: Rename FSDUMP_PART_* macros

Browse Source 
The macro names are a mixture of the original file system dumper (FSDUMP)
and its extension to cut the file system and write directly to a partition
(PART). The original dumper no longer exists and today the feature is
called zfcpdump. Prevent confusion by renaming the macros to fit todays
usage.

Signed-off-by: Philipp Rudo <prudo@linux.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Philipp Rudo
2018-07-05 10:54:35 +02:00
committed by Jan Höppner
parent 576034e94a
commit dcc63e6dfc
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zipl/include/zipl.h
+2 -2
View File
@@ -48,9 +48,9 @@
#define MENU_DEFAULT_PROMPT 0 #define MENU_DEFAULT_PROMPT 0
#define MENU_DEFAULT_TIMEOUT 0 #define MENU_DEFAULT_TIMEOUT 0
#define FSDUMP_PART_IMAGE STRINGIFY(ZFCPDUMP_DIR) "/" \ #define ZFCPDUMP_IMAGE STRINGIFY(ZFCPDUMP_DIR) "/" \
STRINGIFY(ZFCPDUMP_PART_IMAGE) STRINGIFY(ZFCPDUMP_PART_IMAGE)
#define FSDUMP_PART_RAMDISK STRINGIFY(ZFCPDUMP_DIR) "/" \ #define ZFCPDUMP_INITRD STRINGIFY(ZFCPDUMP_DIR) "/" \
STRINGIFY(ZFCPDUMP_PART_RD) STRINGIFY(ZFCPDUMP_PART_RD)
#define MAX_DUMP_VOLUMES 32 #define MAX_DUMP_VOLUMES 32
zipl/src/job.c
+5 -5
View File
@@ -874,22 +874,22 @@ check_job_dump_images(struct job_dump_data* dump, char* name)
{ {
int rc; int rc;
/* Add data needed to convert fs dump job to IPL job */ /* Add data needed to convert fs dump job to IPL job */
rc = misc_check_readable_file(FSDUMP_PART_IMAGE); rc = misc_check_readable_file(ZFCPDUMP_IMAGE);
if (rc) { if (rc) {
error_text("Need external file '%s' for partition dump", error_text("Need external file '%s' for partition dump",
FSDUMP_PART_IMAGE); ZFCPDUMP_IMAGE);
return rc; return rc;
} }
dump->image = misc_strdup(FSDUMP_PART_IMAGE); dump->image = misc_strdup(ZFCPDUMP_IMAGE);
if (dump->image == NULL) if (dump->image == NULL)
return -1; return -1;
dump->image_addr = DEFAULT_IMAGE_ADDRESS; dump->image_addr = DEFAULT_IMAGE_ADDRESS;
/* Ramdisk is no longer required with new initramfs dump system */ /* Ramdisk is no longer required with new initramfs dump system */
if (misc_check_readable_file(FSDUMP_PART_RAMDISK)) if (misc_check_readable_file(ZFCPDUMP_INITRD))
dump->ramdisk = NULL; dump->ramdisk = NULL;
else { else {
dump->ramdisk = misc_strdup(FSDUMP_PART_RAMDISK); dump->ramdisk = misc_strdup(ZFCPDUMP_INITRD);
if (dump->ramdisk == NULL) if (dump->ramdisk == NULL)
return -1; return -1;
dump->ramdisk_addr = UNSPECIFIED_ADDRESS; dump->ramdisk_addr = UNSPECIFIED_ADDRESS;