From bd1064a61103cb81faf1ea85387f438add67e6c1 Mon Sep 17 00:00:00 2001
From: Iru Cai <mytbk920423@gmail.com>
Date: Mon, 22 Oct 2018 23:23:24 +0800
Subject: distro: add xubuntu

modify the ubuntu entry and install.sh to use DISTRONAME and KEYWORD
so that these scripts can be reused.
---
 distro/ubuntu/entry      | 8 ++++----
 distro/ubuntu/install.sh | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'distro/ubuntu')

diff --git a/distro/ubuntu/entry b/distro/ubuntu/entry
index c9a4c7a..83888ca 100644
--- a/distro/ubuntu/entry
+++ b/distro/ubuntu/entry
@@ -1,5 +1,5 @@
-TITLE="Ubuntu ${_ver} x86_64 Desktop"
-KERNEL="/liveusb-kernel/ubuntu/${_ver}/64/${VMLINUZ}"
-INITRD="/liveusb-kernel/ubuntu/${_ver}/64/${INITRD}"
-OPTION="file=/cdrom/preseed/ubuntu.seed boot=casper iso-scan/filename=/liveusb-data/ubuntu/$ISOFILE"
+TITLE="${DISTRONAME} ${_ver} x86_64 Desktop"
+KERNEL="/liveusb-kernel/${KEYWORD}/${_ver}/64/${VMLINUZ}"
+INITRD="/liveusb-kernel/${KEYWORD}/${_ver}/64/${INITRD}"
+OPTION="file=/cdrom/preseed/ubuntu.seed boot=casper iso-scan/filename=/liveusb-data/${KEYWORD}/$ISOFILE"
 X64=y
diff --git a/distro/ubuntu/install.sh b/distro/ubuntu/install.sh
index f6edab7..20b8d3f 100644
--- a/distro/ubuntu/install.sh
+++ b/distro/ubuntu/install.sh
@@ -1,7 +1,7 @@
 install_live() {
-	install -d "$KERNELDIR/ubuntu/${_ver}/64" "$DATADIR/ubuntu"
-	cp "$ISOPATH/$ISOFILE" "$DATADIR/ubuntu/"
+	install -d "$KERNELDIR/${KEYWORD}/${_ver}/64" "$DATADIR/${KEYWORD}"
+	cp "$ISOPATH/$ISOFILE" "$DATADIR/${KEYWORD}/"
 	mount_iso
-	cp "$ISOMNT/casper/${VMLINUZ}" "$ISOMNT/casper/${INITRD}" "$KERNELDIR/ubuntu/${_ver}/64/"
+	cp "$ISOMNT/casper/${VMLINUZ}" "$ISOMNT/casper/${INITRD}" "$KERNELDIR/${KEYWORD}/${_ver}/64/"
 	umount_iso
 }
-- 
cgit v1.2.3