sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add support for using local PowerPC VM image"

Browse Source
This commit is contained in:
Jenkins 2015-02-04 06:40:06 +00:00 committed by Gerrit Code Review
commit d67e2de859
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/redhat-common/bin/extract-image
View File

@ -50,7 +50,7 @@ function extract_image() {
qemu-img convert -f qcow2 -O raw $CACHED_IMAGE $WORKING/$RAW_FILE qemu-img convert -f qcow2 -O raw $CACHED_IMAGE $WORKING/$RAW_FILE
ROOT_PARTITON=p1 ROOT_PARTITON=p$(sudo kpartx -l $WORKING/$RAW_FILE | awk "/loop[0-9]+p/"|wc -l)
# kpartx fails if no /dev/loop* exists, "losetup -f" prints first unused # kpartx fails if no /dev/loop* exists, "losetup -f" prints first unused
# loop device and creates it if it doesn't exist # loop device and creates it if it doesn't exist

6
elements/rpm-distro/pre-install.d/01-override-yum-arch
View File

@ -9,6 +9,12 @@ if [ "i386" = "$ARCH" ]; then
elif [ "amd64" = "$ARCH" ]; then elif [ "amd64" = "$ARCH" ]; then
basearch=x86_64 basearch=x86_64
arch=x86_64 arch=x86_64
elif [[ "$ARCH" = "ppc64" ]]; then
basearch=ppc64
arch=ppc64
elif [[ "$ARCH" = "ppc64el" ]]; then
basearch=ppc64el
arch=ppc64el
else else
echo "********************" echo "********************"
echo "Unknown arch '$ARCH'" echo "Unknown arch '$ARCH'"