support ppc64el

2 files changed, 21 insertions, 7 deletions

diff --git a/debvm-create b/debvm-create
index b2a213d..8870e09 100755
--- a/debvm-create
+++ b/debvm-create
@@ -95,6 +95,9 @@ case "$ARCHITECTURE" in
 	i386)
 		KERNEL_SUFFIX=-686-pae
 	;;
+	ppc64el)
+		KERNEL_SUFFIX=-powerpc64le
+	;;
 esac
 
 INCLUDE_PACKAGES="$INCLUDE_PACKAGES,linux-image$KERNEL_SUFFIX"
@@ -113,11 +116,11 @@ set -- \
 
 # unless we set up a fstab, / will be read-only
 case "$ARCHITECTURE" in
-	s390x)
-		DISKDEV=vda
+	amd64|i386|ppc64el)
+		DISKDEV=sda
 	;;
 	*)
-		DISKDEV=sda
+		DISKDEV=vda
 	;;
 esac
 set -- "--customize-hook=echo '/dev/$DISKDEV / ext4 defaults 0 1' >"'"$1/etc/fstab"' "$@"
diff --git a/debvm-run b/debvm-run
index d8362a0..c9dc740 100755
--- a/debvm-run
+++ b/debvm-run
@@ -45,9 +45,6 @@ done
 
 test -f "$IMAGE" || die "image '$IMAGE' not found"
 
-KERNELNAME=$(/sbin/debugfs "$IMAGE" -R "stat vmlinuz" | sed 's/Fast link dest: "\(.*\)"/\1/;t;d')
-INITRDNAME=$(/sbin/debugfs "$IMAGE" -R "stat initrd.img" | sed 's/Fast link dest: "\(.*\)"/\1/;t;d')
-
 cleanup() {
 	set +x
 	test -n "$KERNELTMP" && rm -f "$KERNELTMP"
@@ -66,13 +63,24 @@ if command -v elf-arch >/dev/null 2>&1; then
 	VMARCH=$(elf-arch "$KERNELTMP")
 fi
 case "$VMARCH" in
-	amd64|i386)
+	amd64|i386|ppc64el)
 		DISKDEV=sda
 	;;
 	*)
 		DISKDEV=vda
 	;;
 esac
+case "$VMARCH" in
+	ppc64el)
+		KERNELLINK=vmlinux
+	;;
+	*)
+		KERNELLINK=vmlinuz
+	;;
+esac
+
+KERNELNAME=$(/sbin/debugfs "$IMAGE" -R "stat $KERNELLINK" | sed 's/Fast link dest: "\(.*\)"/\1/;t;d')
+INITRDNAME=$(/sbin/debugfs "$IMAGE" -R "stat initrd.img" | sed 's/Fast link dest: "\(.*\)"/\1/;t;d')
 
 KERNEL_CMDLINE=root=/dev/$DISKDEV
 NETDEV="user,id=net0"
@@ -103,6 +111,9 @@ else
 			QEMU=qemu-system-arm
 			set -- -machine virt -cpu max "$@"
 		;;
+		ppc64el)
+			QEMU=qemu-system-ppc64
+		;;
 		*)
 			QEMU="qemu-system-$VMARCH"
 		;;