Blame SOURCES/rear-bz1571266-pr1383.patch

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