diff --git a/usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh b/usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh deleted file mode 100644 index 005de330..00000000 --- a/usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh +++ /dev/null @@ -1,34 +0,0 @@ -# 800_create_isofs.sh -# -# create initramfs for Relax-and-Recover -# -# This file is part of Relax-and-Recover, licensed under the GNU General -# Public License. Refer to the included COPYING for full text of license. - -# check that we have mkisofs -[ -x "$ISO_MKISOFS_BIN" ] -StopIfError "ISO_MKISOFS_BIN [$ISO_MKISOFS_BIN] not an executable !" - -Log "Copying kernel" -cp -pL $v $KERNEL_FILE $TMP_DIR/kernel >&2 - -if [[ "$SUSE_STYLE" ]]; then - ISO_FILES=( ${ISO_FILES[@]} $TMP_DIR/kernel initrd.cgz yaboot) -else - ISO_FILES=( ${ISO_FILES[@]} $TMP_DIR/kernel initrd.cgz) -fi -Log "Starting '$ISO_MKISOFS_BIN'" -LogPrint "Making ISO image" - -mkdir -p $v "$ISO_DIR" >&2 -StopIfError "Could not create ISO ouput directory ($ISO_DIR)" - -pushd $TMP_DIR >&8 # so that relative paths will work -$ISO_MKISOFS_BIN $v -o "$ISO_DIR/$ISO_PREFIX.iso" -U -chrp-boot \ - -R -J -volid "$ISO_VOLID" -v -graft-points "${ISO_FILES[@]}" >&8 -StopIfError "Could not create ISO image" -popd >&8 -Print "Wrote ISO Image $ISO_DIR/$ISO_PREFIX.iso ($(du -h "$ISO_DIR/$ISO_PREFIX.iso"| tr -s " \t" " " | cut -d " " -f 1))" - -# Add ISO image to result files -RESULT_FILES=( "${RESULT_FILES[@]}" "$ISO_DIR/$ISO_PREFIX.iso" ) diff --git a/usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh b/usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh new file mode 120000 index 00000000..b2cd4893 --- /dev/null +++ b/usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh @@ -0,0 +1 @@ +../Linux-ppc64le/800_create_isofs.sh \ No newline at end of file diff --git a/usr/share/rear/output/ISO/Linux-ppc64/810_prepare_multiple_iso.sh b/usr/share/rear/output/ISO/Linux-ppc64/810_prepare_multiple_iso.sh new file mode 120000 index 00000000..04f8a495 --- /dev/null +++ b/usr/share/rear/output/ISO/Linux-ppc64/810_prepare_multiple_iso.sh @@ -0,0 +1 @@ +../Linux-i386/810_prepare_multiple_iso.sh \ No newline at end of file diff --git a/usr/share/rear/output/ISO/Linux-ppc64/820_create_iso_image.sh b/usr/share/rear/output/ISO/Linux-ppc64/820_create_iso_image.sh new file mode 120000 index 00000000..981cfd2e --- /dev/null +++ b/usr/share/rear/output/ISO/Linux-ppc64/820_create_iso_image.sh @@ -0,0 +1 @@ +../Linux-ppc64le/820_create_iso_image.sh \ No newline at end of file diff --git a/usr/share/rear/output/ISO/Linux-ppc64le/800_create_isofs.sh b/usr/share/rear/output/ISO/Linux-ppc64le/800_create_isofs.sh index f0c023cd..d9ce61de 100644 --- a/usr/share/rear/output/ISO/Linux-ppc64le/800_create_isofs.sh +++ b/usr/share/rear/output/ISO/Linux-ppc64le/800_create_isofs.sh @@ -18,13 +18,3 @@ LogPrint "Making ISO image" mkdir -p $v "$ISO_DIR" >&2 StopIfError "Could not create ISO ouput directory ($ISO_DIR)" - -pushd $TMP_DIR >&8 # so that relative paths will work -$ISO_MKISOFS_BIN $v -o "$ISO_DIR/$ISO_PREFIX.iso" -U -chrp-boot \ - -R -J -volid "$ISO_VOLID" -v -graft-points "${ISO_FILES[@]}" >&8 -StopIfError "Could not create ISO image" -popd >&8 -Print "Wrote ISO Image $ISO_DIR/$ISO_PREFIX.iso ($(du -h "$ISO_DIR/$ISO_PREFIX.iso"| tr -s " \t" " " | cut -d " " -f 1))" - -# Add ISO image to result files -RESULT_FILES=( "${RESULT_FILES[@]}" "$ISO_DIR/$ISO_PREFIX.iso" ) diff --git a/usr/share/rear/output/ISO/Linux-ppc64le/810_prepare_multiple_iso.sh b/usr/share/rear/output/ISO/Linux-ppc64le/810_prepare_multiple_iso.sh new file mode 120000 index 00000000..04f8a495 --- /dev/null +++ b/usr/share/rear/output/ISO/Linux-ppc64le/810_prepare_multiple_iso.sh @@ -0,0 +1 @@ +../Linux-i386/810_prepare_multiple_iso.sh \ No newline at end of file diff --git a/usr/share/rear/output/ISO/Linux-ppc64le/820_create_iso_image.sh b/usr/share/rear/output/ISO/Linux-ppc64le/820_create_iso_image.sh new file mode 100644 index 00000000..28b6464f --- /dev/null +++ b/usr/share/rear/output/ISO/Linux-ppc64le/820_create_iso_image.sh @@ -0,0 +1,29 @@ + +Log "Starting '$ISO_MKISOFS_BIN'" +LogPrint "Making ISO image" + +pushd $TMP_DIR >&2 + +# If isofs directory exists, add its content to ISO_FILES (when backup must be part of the ISO images) +if [ -d isofs ] ; then + ISO_FILES=( ${ISO_FILES[@]} isofs ) +fi + +# mkisofs command for ppc64/ppc64le arch +# Adapt the chrp-boot option if xorrisofs is used. +if [[ "$(basename $ISO_MKISOFS_BIN)" == "xorrisofs" ]]; then + chrp_boot_option="-chrp-boot-part" +else + chrp_boot_option="-chrp-boot" +fi + +$ISO_MKISOFS_BIN $v -o "$ISO_DIR/$ISO_PREFIX.iso" -U $chrp_boot_option -R -J -volid "$ISO_VOLID" -v -graft-points "${ISO_FILES[@]}" >&2 + +StopIfError "Could not create ISO image (with $ISO_MKISOFS_BIN)" +popd >&2 + +iso_image_size=( $(du -h "$ISO_DIR/$ISO_PREFIX.iso") ) +LogPrint "Wrote ISO image: $ISO_DIR/$ISO_PREFIX.iso ($iso_image_size)" + +# Add ISO image to result files +RESULT_FILES=( "${RESULT_FILES[@]}" "$ISO_DIR/$ISO_PREFIX.iso" )