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 +++---
 distro/xubuntu/18.04/config     | 3 +++
 distro/xubuntu/18.04/entry      | 2 ++
 distro/xubuntu/18.04/install.sh | 2 ++
 distro/xubuntu/18.04/isoinfo    | 8 ++++++++
 distro/xubuntu/distroinfo       | 2 ++
 7 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 distro/xubuntu/18.04/config
 create mode 100644 distro/xubuntu/18.04/entry
 create mode 100644 distro/xubuntu/18.04/install.sh
 create mode 100644 distro/xubuntu/18.04/isoinfo
 create mode 100644 distro/xubuntu/distroinfo

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
 }
diff --git a/distro/xubuntu/18.04/config b/distro/xubuntu/18.04/config
new file mode 100644
index 0000000..e812e5b
--- /dev/null
+++ b/distro/xubuntu/18.04/config
@@ -0,0 +1,3 @@
+_ver=18.04
+VMLINUZ=vmlinuz
+INITRD=initrd
diff --git a/distro/xubuntu/18.04/entry b/distro/xubuntu/18.04/entry
new file mode 100644
index 0000000..d41657c
--- /dev/null
+++ b/distro/xubuntu/18.04/entry
@@ -0,0 +1,2 @@
+source distro/xubuntu/18.04/config
+source distro/ubuntu/entry
diff --git a/distro/xubuntu/18.04/install.sh b/distro/xubuntu/18.04/install.sh
new file mode 100644
index 0000000..85f79dd
--- /dev/null
+++ b/distro/xubuntu/18.04/install.sh
@@ -0,0 +1,2 @@
+source distro/xubuntu/18.04/config
+source distro/ubuntu/install.sh
diff --git a/distro/xubuntu/18.04/isoinfo b/distro/xubuntu/18.04/isoinfo
new file mode 100644
index 0000000..afe93c3
--- /dev/null
+++ b/distro/xubuntu/18.04/isoinfo
@@ -0,0 +1,8 @@
+_isover=18.04.1
+ISONAME="$DISTRONAME ${_isover} amd64"
+ISOURL="${_isover}/release/xubuntu-${_isover}-desktop-amd64.iso"
+SHA256=cd4ad5df40a542db9eef2e0449a6c1839c5c14e26053642c4ad39d5026b73b1a
+
+mirrorlist=(
+https://mirrors.tuna.tsinghua.edu.cn/ubuntu-cdimage/xubuntu/releases
+)
diff --git a/distro/xubuntu/distroinfo b/distro/xubuntu/distroinfo
new file mode 100644
index 0000000..0eaf100
--- /dev/null
+++ b/distro/xubuntu/distroinfo
@@ -0,0 +1,2 @@
+DISTRONAME='Xubuntu'
+KEYWORD='xubuntu'
-- 
cgit v1.2.3