diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-14 18:52:15 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-14 18:52:15 +0100 |
commit | d00821e77f72d4af4ea30158c1c6e18ffff0875b (patch) | |
tree | b28b6cb077ae6b2457e30d49028fc978d8e2b59b /app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch | |
parent | 36ac65103bf5503e5bad1ecc7e8cb9e7643f6840 (diff) | |
parent | 6a339b4f9ec107438bb71a6f9ca72fd42fbfd436 (diff) |
Merge branch 'next'
Diffstat (limited to 'app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch')
-rw-r--r-- | app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch b/app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch deleted file mode 100644 index 73e7ab8a923d..000000000000 --- a/app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/common.sh.in 2018-09-05 23:23:07.811528673 +0000 -+++ b/common.sh.in 2018-09-06 00:10:36.993693654 +0000 -@@ -284,13 +284,13 @@ - blockdev="$1" - filesystem_dev_base=`$KPARTX -l -p- $blockdev | \ - grep -m 1 -- "-1.*$blockdev" | \ -- $AWK '{print $1}'` -+ $AWK '{print $1}' | sed -r -e 's/-([0-9]{1,2})$/p\1/g'` - if [ -z "$filesystem_dev_base" ]; then - log_error "Cannot interpret kpartx output and get partition mapping" - exit 1 - fi - $KPARTX -a -p- $blockdev > /dev/null -- filesystem_dev="/dev/mapper/${filesystem_dev_base/%-1/}" -+ filesystem_dev="/dev/mapper/${filesystem_dev_base/%p1/}" - if [ ! -b "/dev/mapper/$filesystem_dev_base" ]; then - log_error "Can't find kpartx mapped partition: /dev/mapper/$filesystem_dev_base" - exit 1 -@@ -302,17 +302,17 @@ - filesystem_dev="$1" - partition="$2" - if [ "${SWAP}" = "yes" -a -z "${KERNEL_PATH}" ] ; then -- boot_dev="${filesystem_dev}-1" -- swap_dev="${filesystem_dev}-2" -- root_dev="${filesystem_dev}-3" -+ boot_dev="${filesystem_dev}p1" -+ swap_dev="${filesystem_dev}p2" -+ root_dev="${filesystem_dev}p3" - elif [ "${SWAP}" = "no" -a -z "${KERNEL_PATH}" ] ; then -- boot_dev="${filesystem_dev}-1" -- root_dev="${filesystem_dev}-2" -+ boot_dev="${filesystem_dev}p1" -+ root_dev="${filesystem_dev}p2" - elif [ "${SWAP}" = "yes" -a -n "${KERNEL_PATH}" ] ; then -- swap_dev="${filesystem_dev}-1" -+ swap_dev="${filesystem_dev}p1" - root_dev="${filesystem_dev}-2" - elif [ "${SWAP}" = "no" -a -n "${KERNEL_PATH}" ] ; then -- root_dev="${filesystem_dev}-1" -+ root_dev="${filesystem_dev}p1" - fi - echo "$(eval "echo \${$(echo ${partition}_dev)"})" - } |