distro/mint: add Xfce and Cinnamon desktop

- Move mint/mate/64 as mint/64/mate because
  64-bit and 32-bit is a more significant difference than desktop
- The kernel of Xfce and MATE is identical and the initrd.lz is
  almost identical, it's OK to use the same vmlinuz and initrd.lz
  for both ISOs
- remove the creation of $DATADIR/mint/64

9 files changed, 41 insertions, 1 deletions

diff --git a/distro/mint/64/cinnamon/entry b/distro/mint/64/cinnamon/entry
new file mode 100644
index 0000000..8505df3
--- /dev/null
+++ b/distro/mint/64/cinnamon/entry
@@ -0,0 +1,5 @@
+TITLE='Linux Mint 18 x86_64 with Cinnamon Desktop'
+KERNEL=/liveusb-kernel/mint/64/vmlinuz
+INITRD=/liveusb-kernel/mint/64/initrd.lz
+OPTION="file=/cdrom/preseed/linuxmint.seed boot=casper iso-scan/filename=/liveusb-data/mint/$ISOFILE quiet splash --"
+X64=y
diff --git a/distro/mint/mate/64/install.sh b/distro/mint/64/cinnamon/install.sh
index 3aff3e2..1e37ee2 100644
--- a/distro/mint/mate/64/install.sh
+++ b/distro/mint/64/cinnamon/install.sh
@@ -1,5 +1,5 @@
 install_live() {
-	install -d "$KERNELDIR/mint/64" "$DATADIR/mint/64"
+	install -d "$KERNELDIR/mint/64"
 	cp "isofiles/$ISOFILE" "$DATADIR/mint/"
 	mount_iso
 	cp "$ISOMNT/casper/vmlinuz" "$ISOMNT/casper/initrd.lz" "$KERNELDIR/mint/64/"
diff --git a/distro/mint/64/cinnamon/isoinfo b/distro/mint/64/cinnamon/isoinfo
new file mode 100644
index 0000000..92c857e
--- /dev/null
+++ b/distro/mint/64/cinnamon/isoinfo
@@ -0,0 +1,7 @@
+ISOURL=stable/18/linuxmint-18-cinnamon-64bit.iso
+SHA256=2238dca5b51f9e2674a7e31c46f19141fbdecff6e44c06ecbc9a7bb59b75a816
+
+mirrorlist=(
+https://mirrors.tuna.tsinghua.edu.cn/linuxmint-cd
+http://mirrors.ustc.edu.cn/linuxmint-cd
+)
diff --git a/distro/mint/mate/64/entry b/distro/mint/64/mate/entry
index b190746..b190746 100644
--- a/distro/mint/mate/64/entry
+++ b/distro/mint/64/mate/entry
diff --git a/distro/mint/64/mate/install.sh b/distro/mint/64/mate/install.sh
new file mode 100644
index 0000000..1e37ee2
--- /dev/null
+++ b/distro/mint/64/mate/install.sh
@@ -0,0 +1,8 @@
+install_live() {
+	install -d "$KERNELDIR/mint/64"
+	cp "isofiles/$ISOFILE" "$DATADIR/mint/"
+	mount_iso
+	cp "$ISOMNT/casper/vmlinuz" "$ISOMNT/casper/initrd.lz" "$KERNELDIR/mint/64/"
+	umount_iso
+}
+
diff --git a/distro/mint/mate/64/isoinfo b/distro/mint/64/mate/isoinfo
index 11dbed4..11dbed4 100644
--- a/distro/mint/mate/64/isoinfo
+++ b/distro/mint/64/mate/isoinfo
diff --git a/distro/mint/64/xfce/entry b/distro/mint/64/xfce/entry
new file mode 100644
index 0000000..eafcd4c
--- /dev/null
+++ b/distro/mint/64/xfce/entry
@@ -0,0 +1,5 @@
+TITLE='Linux Mint 18 x86_64 with Xfce Desktop'
+KERNEL=/liveusb-kernel/mint/64/vmlinuz
+INITRD=/liveusb-kernel/mint/64/initrd.lz
+OPTION="file=/cdrom/preseed/linuxmint.seed boot=casper iso-scan/filename=/liveusb-data/mint/$ISOFILE quiet splash --"
+X64=y
diff --git a/distro/mint/64/xfce/install.sh b/distro/mint/64/xfce/install.sh
new file mode 100644
index 0000000..1e37ee2
--- /dev/null
+++ b/distro/mint/64/xfce/install.sh
@@ -0,0 +1,8 @@
+install_live() {
+	install -d "$KERNELDIR/mint/64"
+	cp "isofiles/$ISOFILE" "$DATADIR/mint/"
+	mount_iso
+	cp "$ISOMNT/casper/vmlinuz" "$ISOMNT/casper/initrd.lz" "$KERNELDIR/mint/64/"
+	umount_iso
+}
+
diff --git a/distro/mint/64/xfce/isoinfo b/distro/mint/64/xfce/isoinfo
new file mode 100644
index 0000000..e56cefe
--- /dev/null
+++ b/distro/mint/64/xfce/isoinfo
@@ -0,0 +1,7 @@
+ISOURL=stable/18/linuxmint-18-xfce-64bit.iso
+SHA256=2151852abb34bd62350fab807acc04b3f337d928c7c8092aebea7d0524587acf
+
+mirrorlist=(
+https://mirrors.tuna.tsinghua.edu.cn/linuxmint-cd
+http://mirrors.ustc.edu.cn/linuxmint-cd
+)