summaryrefslogtreecommitdiff
path: root/distro/ubuntu
diff options
context:
space:
mode:
Diffstat (limited to 'distro/ubuntu')
-rw-r--r--distro/ubuntu/14.04/entry5
-rw-r--r--distro/ubuntu/14.04/install.sh (renamed from distro/ubuntu/install.sh)4
-rw-r--r--distro/ubuntu/14.04/isoinfo10
-rw-r--r--distro/ubuntu/16.04/entry5
-rw-r--r--distro/ubuntu/16.04/install.sh8
-rw-r--r--distro/ubuntu/16.04/isoinfo (renamed from distro/ubuntu/isoinfo)1
-rw-r--r--distro/ubuntu/entry5
7 files changed, 31 insertions, 7 deletions
diff --git a/distro/ubuntu/14.04/entry b/distro/ubuntu/14.04/entry
new file mode 100644
index 0000000..55df603
--- /dev/null
+++ b/distro/ubuntu/14.04/entry
@@ -0,0 +1,5 @@
+TITLE='Ubuntu 14.04.5 x86_64 Desktop'
+KERNEL=/liveusb-kernel/ubuntu/14.04/64/vmlinuz.efi
+INITRD=/liveusb-kernel/ubuntu/14.04/64/initrd.lz
+OPTION="file=/cdrom/preseed/ubuntu.seed boot=casper iso-scan/filename=/liveusb-data/ubuntu/$ISOFILE quiet splash ---"
+X64=y
diff --git a/distro/ubuntu/install.sh b/distro/ubuntu/14.04/install.sh
index 51ae17e..97addac 100644
--- a/distro/ubuntu/install.sh
+++ b/distro/ubuntu/14.04/install.sh
@@ -1,8 +1,8 @@
install_live() {
- install -d "$KERNELDIR/ubuntu/64" "$DATADIR/ubuntu"
+ install -d "$KERNELDIR/ubuntu/14.04/64" "$DATADIR/ubuntu"
cp "isofiles/$ISOFILE" "$DATADIR/ubuntu/"
mount_iso
- cp "$ISOMNT/casper/vmlinuz.efi" "$ISOMNT/casper/initrd.lz" "$KERNELDIR/ubuntu/64/"
+ cp "$ISOMNT/casper/vmlinuz.efi" "$ISOMNT/casper/initrd.lz" "$KERNELDIR/ubuntu/14.04/64/"
umount_iso
}
diff --git a/distro/ubuntu/14.04/isoinfo b/distro/ubuntu/14.04/isoinfo
new file mode 100644
index 0000000..a9f0185
--- /dev/null
+++ b/distro/ubuntu/14.04/isoinfo
@@ -0,0 +1,10 @@
+_isover=14.04.5
+ISONAME="$DISTRONAME ${_isover} amd64"
+ISOURL="${_isover}/ubuntu-${_isover}-desktop-amd64.iso"
+SHA256=f5ce20686a2f3201f04a309d04171ee15757f00954b33b87f3f1d36b3b0f5356
+
+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/16.04/entry b/distro/ubuntu/16.04/entry
new file mode 100644
index 0000000..f03f284
--- /dev/null
+++ b/distro/ubuntu/16.04/entry
@@ -0,0 +1,5 @@
+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
diff --git a/distro/ubuntu/16.04/install.sh b/distro/ubuntu/16.04/install.sh
new file mode 100644
index 0000000..653e2f5
--- /dev/null
+++ b/distro/ubuntu/16.04/install.sh
@@ -0,0 +1,8 @@
+install_live() {
+ install -d "$KERNELDIR/ubuntu/16.04/64" "$DATADIR/ubuntu"
+ cp "isofiles/$ISOFILE" "$DATADIR/ubuntu/"
+ mount_iso
+ cp "$ISOMNT/casper/vmlinuz.efi" "$ISOMNT/casper/initrd.lz" "$KERNELDIR/ubuntu/16.04/64/"
+ umount_iso
+}
+
diff --git a/distro/ubuntu/isoinfo b/distro/ubuntu/16.04/isoinfo
index 8fdff9a..a8d5598 100644
--- a/distro/ubuntu/isoinfo
+++ b/distro/ubuntu/16.04/isoinfo
@@ -4,6 +4,7 @@ ISOURL="${_isover}/ubuntu-${_isover}-desktop-amd64.iso"
SHA256=1384ac8f2c2a6479ba2a9cbe90a585618834560c477a699a4a7ebe7b5345ddc1
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
deleted file mode 100644
index 46795cf..0000000
--- a/distro/ubuntu/entry
+++ /dev/null
@@ -1,5 +0,0 @@
-TITLE='Ubuntu 16.04.1 x86_64 Desktop'
-KERNEL=/liveusb-kernel/ubuntu/64/vmlinuz.efi
-INITRD=/liveusb-kernel/ubuntu/64/initrd.lz
-OPTION="file=/cdrom/preseed/ubuntu.seed boot=casper iso-scan/filename=/liveusb-data/ubuntu/$ISOFILE quiet splash ---"
-X64=y