From 1478a0195a53233c8343777703e8a94d1fdb23d1 Mon Sep 17 00:00:00 2001
From: Iru Cai <mytbk920423@gmail.com>
Date: Sun, 2 Sep 2018 10:21:50 +0800
Subject: make manjaro work

---
 distro/manjaro/entry      | 6 +++---
 distro/manjaro/install.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/distro/manjaro/entry b/distro/manjaro/entry
index 1c0618e..401971c 100644
--- a/distro/manjaro/entry
+++ b/distro/manjaro/entry
@@ -1,7 +1,7 @@
 TITLE="Manjaro Linux $_arch $_flavour"
-KERNEL=/liveusb-kernel/manjaro/$_arch/manjaro
+KERNEL=/liveusb-kernel/manjaro/vmlinuz-${_arch}
 INITRD=(/liveusb-kernel/manjaro/intel_ucode.img
-		/liveusb-kernel/manjaro/$_arch/manjaro.img)
-OPTION="misolabel=MJRO1608 img_dev=/dev/disk/by-uuid/$UUID img_loop=liveusb-data/manjaro/$ISOFILE"
+		/liveusb-kernel/manjaro/initramfs-${_arch}.img)
+OPTION="img_dev=/dev/disk/by-uuid/$UUID img_loop=liveusb-data/manjaro/$ISOFILE"
 [ $_arch == i686 ] && X64=n || X64=y
 
diff --git a/distro/manjaro/install.sh b/distro/manjaro/install.sh
index a9de58b..4e64fc7 100644
--- a/distro/manjaro/install.sh
+++ b/distro/manjaro/install.sh
@@ -1,7 +1,7 @@
 install_live() {
 	install -d "$DATADIR/manjaro/" "$KERNELDIR/manjaro"
 	mount_iso
-	cp -r "$ISOMNT/manjaro/boot/$ARCH" "$ISOMNT/manjaro/boot/intel_ucode.img" \
+	cp "$ISOMNT/boot/vmlinuz-$ARCH" "$ISOMNT/boot/initramfs-$ARCH.img" "$ISOMNT/boot/intel_ucode.img" \
 	       	"$KERNELDIR/manjaro"
 	umount_iso
         cp "$ISOPATH/$ISOFILE" "$DATADIR/manjaro/"
-- 
cgit v1.2.3