summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIru Cai <mytbk920423@gmail.com>2016-08-08 16:54:07 +0800
committerIru Cai <mytbk920423@gmail.com>2016-08-08 18:03:21 +0800
commitdec03d35c56d641778658937d64114df468347bd (patch)
tree6f48bf13da504f100e28be8d54c76e3d62d639c0
parent5ab6b14925978bfb9c4f563b5c9f5cc9bf19d443 (diff)
downloadliveusb-builder-dec03d35c56d641778658937d64114df468347bd.tar.xz
distro: move ISOFILE, hash sum, mirrorlist to isoinfo file
-rw-r--r--distro/arch/install.sh3
-rw-r--r--distro/arch/isoinfo7
-rw-r--r--distro/arch/mirrorlist2
-rw-r--r--distro/fedora/install.sh3
-rw-r--r--distro/fedora/isoinfo7
-rw-r--r--distro/fedora/mirrorlist2
-rw-r--r--distro/mint/mate/64/install.sh3
-rw-r--r--distro/mint/mate/64/isoinfo7
-rw-r--r--distro/mint/mate/64/mirrorlist2
9 files changed, 21 insertions, 15 deletions
diff --git a/distro/arch/install.sh b/distro/arch/install.sh
index f31f89c..c579442 100644
--- a/distro/arch/install.sh
+++ b/distro/arch/install.sh
@@ -1,6 +1,3 @@
-ISOURL=iso/2016.08.01/archlinux-2016.08.01-dual.iso
-SHA1=6db5a9e46267ba7ec4d9ae79d141e5a6d9d3cf88
-
install_live() {
mount_iso
install -d "$DATADIR/arch"
diff --git a/distro/arch/isoinfo b/distro/arch/isoinfo
new file mode 100644
index 0000000..7dff318
--- /dev/null
+++ b/distro/arch/isoinfo
@@ -0,0 +1,7 @@
+ISOURL=iso/2016.08.01/archlinux-2016.08.01-dual.iso
+SHA1=6db5a9e46267ba7ec4d9ae79d141e5a6d9d3cf88
+
+mirrorlist=(
+https://mirrors.tuna.tsinghua.edu.cn/archlinux
+http://mirrors.ustc.edu.cn/archlinux
+)
diff --git a/distro/arch/mirrorlist b/distro/arch/mirrorlist
deleted file mode 100644
index b7c1c8d..0000000
--- a/distro/arch/mirrorlist
+++ /dev/null
@@ -1,2 +0,0 @@
-https://mirrors.tuna.tsinghua.edu.cn/archlinux/
-http://mirrors.ustc.edu.cn/archlinux/
diff --git a/distro/fedora/install.sh b/distro/fedora/install.sh
index 6a847e1..7920851 100644
--- a/distro/fedora/install.sh
+++ b/distro/fedora/install.sh
@@ -1,6 +1,3 @@
-ISOURL=releases/24/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-24-1.2.iso
-SHA256=8e12d7ba1fcf3328b8514d627788ee0146c0eef75a5e27f0674ee1fe4f1feaf6
-
install_live() {
mount_iso
install -d "$DATADIR/fedora"
diff --git a/distro/fedora/isoinfo b/distro/fedora/isoinfo
new file mode 100644
index 0000000..7557fd0
--- /dev/null
+++ b/distro/fedora/isoinfo
@@ -0,0 +1,7 @@
+ISOURL=releases/24/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-24-1.2.iso
+SHA256=8e12d7ba1fcf3328b8514d627788ee0146c0eef75a5e27f0674ee1fe4f1feaf6
+
+mirrorlist=(
+https://mirrors.tuna.tsinghua.edu.cn/fedora
+http://mirrors.ustc.edu.cn/fedora/linux
+)
diff --git a/distro/fedora/mirrorlist b/distro/fedora/mirrorlist
deleted file mode 100644
index 18794f6..0000000
--- a/distro/fedora/mirrorlist
+++ /dev/null
@@ -1,2 +0,0 @@
-https://mirrors.tuna.tsinghua.edu.cn/fedora/
-http://mirrors.ustc.edu.cn/fedora/linux/
diff --git a/distro/mint/mate/64/install.sh b/distro/mint/mate/64/install.sh
index 2bca653..3aff3e2 100644
--- a/distro/mint/mate/64/install.sh
+++ b/distro/mint/mate/64/install.sh
@@ -1,6 +1,3 @@
-ISOURL=stable/18/linuxmint-18-mate-64bit.iso
-SHA256=c634f48b248489eef782067484a04978f046e9ccd507d9df35c798a1db9bef22
-
install_live() {
install -d "$KERNELDIR/mint/64" "$DATADIR/mint/64"
cp "isofiles/$ISOFILE" "$DATADIR/mint/"
diff --git a/distro/mint/mate/64/isoinfo b/distro/mint/mate/64/isoinfo
new file mode 100644
index 0000000..11dbed4
--- /dev/null
+++ b/distro/mint/mate/64/isoinfo
@@ -0,0 +1,7 @@
+ISOURL=stable/18/linuxmint-18-mate-64bit.iso
+SHA256=c634f48b248489eef782067484a04978f046e9ccd507d9df35c798a1db9bef22
+
+mirrorlist=(
+https://mirrors.tuna.tsinghua.edu.cn/linuxmint-cd
+http://mirrors.ustc.edu.cn/linuxmint-cd
+)
diff --git a/distro/mint/mate/64/mirrorlist b/distro/mint/mate/64/mirrorlist
deleted file mode 100644
index 53e935c..0000000
--- a/distro/mint/mate/64/mirrorlist
+++ /dev/null
@@ -1,2 +0,0 @@
-https://mirrors.tuna.tsinghua.edu.cn/linuxmint-cd/
-http://mirrors.ustc.edu.cn/linuxmint-cd/