10 files changed, 38 insertions, 15 deletions
diff --git a/distro/ubuntu/16.04/config b/distro/ubuntu/16.04/config
new file mode 100644
index 0000000..176d305
--- /dev/null
+++ b/distro/ubuntu/16.04/config
@@ -0,0 +1,3 @@
+_ver=16.04
+VMLINUZ=vmlinuz
+INITRD=initrd
diff --git a/distro/ubuntu/16.04/entry b/distro/ubuntu/16.04/entry
index f03f284..f83793d 100644
--- a/distro/ubuntu/16.04/entry
+++ b/distro/ubuntu/16.04/entry
@@ -1,5 +1,2 @@
-TITLE='Ubuntu 16.04.3 x86_64 Desktop'
-KERNEL=/liveusb-kernel/ubuntu/16.04/64/vmlinuz.efi
-INITRD=/liveusb-kernel/ubuntu/16.04/64/initrd.lz
-OPTION="file=/cdrom/preseed/ubuntu.seed boot=casper iso-scan/filename=/liveusb-data/ubuntu/$ISOFILE quiet splash ---"
-X64=y
+source distro/ubuntu/16.04/config
+source distro/ubuntu/entry
diff --git a/distro/ubuntu/16.04/install.sh b/distro/ubuntu/16.04/install.sh
index d5a0a12..21e8322 100644
--- a/distro/ubuntu/16.04/install.sh
+++ b/distro/ubuntu/16.04/install.sh
@@ -1,8 +1,2 @@
-install_live() {
-	install -d "$KERNELDIR/ubuntu/16.04/64" "$DATADIR/ubuntu"
-	cp "$ISOPATH/$ISOFILE" "$DATADIR/ubuntu/"
-	mount_iso
-	cp "$ISOMNT/casper/vmlinuz.efi" "$ISOMNT/casper/initrd.lz" "$KERNELDIR/ubuntu/16.04/64/"
-	umount_iso
-}
-
+source distro/ubuntu/16.04/config
+source distro/ubuntu/install.sh
diff --git a/distro/ubuntu/16.04/isoinfo b/distro/ubuntu/16.04/isoinfo
index c9aace9..79aab97 100644
--- a/distro/ubuntu/16.04/isoinfo
+++ b/distro/ubuntu/16.04/isoinfo
@@ -1,7 +1,7 @@
-_isover=16.04.4
+_isover=16.04.5
 ISONAME="$DISTRONAME ${_isover} amd64"
 ISOURL="${_isover}/ubuntu-${_isover}-desktop-amd64.iso"
-SHA256=3380883b70108793ae589a249cccec88c9ac3106981f995962469744c3cbd46d
+SHA256=6b505fd3b6f816f8ff058710f127a9900e9233e496783ce08a0022814d224810
 
 mirrorlist=(
 https://mirrors.tuna.tsinghua.edu.cn/ubuntu-releases
diff --git a/distro/ubuntu/18.04/config b/distro/ubuntu/18.04/config
new file mode 100644
index 0000000..d23c6d2
--- /dev/null
+++ b/distro/ubuntu/18.04/config
@@ -0,0 +1,3 @@
+_ver=18.04
+VMLINUZ=vmlinuz
+INITRD=initrd.lz
diff --git a/distro/ubuntu/18.04/entry b/distro/ubuntu/18.04/entry
new file mode 100644
index 0000000..c5b9f0c
--- /dev/null
+++ b/distro/ubuntu/18.04/entry
@@ -0,0 +1,2 @@
+source distro/ubuntu/18.04/config
+source distro/ubuntu/entry
diff --git a/distro/ubuntu/18.04/install.sh b/distro/ubuntu/18.04/install.sh
new file mode 100644
index 0000000..3cb9afe
--- /dev/null
+++ b/distro/ubuntu/18.04/install.sh
@@ -0,0 +1,2 @@
+source distro/ubuntu/18.04/config
+source distro/ubuntu/install.sh
diff --git a/distro/ubuntu/18.04/isoinfo b/distro/ubuntu/18.04/isoinfo
new file mode 100644
index 0000000..95c0b9e
--- /dev/null
+++ b/distro/ubuntu/18.04/isoinfo
@@ -0,0 +1,10 @@
+_isover=18.04.1
+ISONAME="$DISTRONAME ${_isover} amd64"
+ISOURL="${_isover}/ubuntu-${_isover}-desktop-amd64.iso"
+SHA256=5748706937539418ee5707bd538c4f5eabae485d17aa49fb13ce2c9b70532433
+
+mirrorlist=(
+https://mirrors.tuna.tsinghua.edu.cn/ubuntu-releases
+http://releases.ubuntu.com
+http://mirrors.ustc.edu.cn/ubuntu-releases
+)
diff --git a/distro/ubuntu/entry b/distro/ubuntu/entry
new file mode 100644
index 0000000..c9a4c7a
--- /dev/null
+++ b/distro/ubuntu/entry
@@ -0,0 +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"
+X64=y
diff --git a/distro/ubuntu/install.sh b/distro/ubuntu/install.sh
new file mode 100644
index 0000000..f6edab7
--- /dev/null
+++ b/distro/ubuntu/install.sh
@@ -0,0 +1,7 @@
+install_live() {
+	install -d "$KERNELDIR/ubuntu/${_ver}/64" "$DATADIR/ubuntu"
+	cp "$ISOPATH/$ISOFILE" "$DATADIR/ubuntu/"
+	mount_iso
+	cp "$ISOMNT/casper/${VMLINUZ}" "$ISOMNT/casper/${INITRD}" "$KERNELDIR/ubuntu/${_ver}/64/"
+	umount_iso
+}