From d4c818b818bac8960c7622af00be2500adb3a613 Mon Sep 17 00:00:00 2001
From: Iru Cai <mytbk920423@gmail.com>
Date: Mon, 5 Dec 2016 14:03:00 +0800
Subject: distro/fedora: Add Fedora 25, and fix the GRUB entry

---
 distro/fedora/24/entry      | 2 ++
 distro/fedora/24/install.sh | 3 +++
 distro/fedora/24/isoinfo    | 8 ++++++++
 distro/fedora/25/entry      | 2 ++
 distro/fedora/25/install.sh | 2 ++
 distro/fedora/25/isoinfo    | 8 ++++++++
 distro/fedora/entry         | 5 -----
 distro/fedora/entry.common  | 5 +++++
 distro/fedora/install.sh    | 7 +++----
 distro/fedora/isoinfo       | 8 --------
 10 files changed, 33 insertions(+), 17 deletions(-)
 create mode 100644 distro/fedora/24/entry
 create mode 100644 distro/fedora/24/install.sh
 create mode 100644 distro/fedora/24/isoinfo
 create mode 100644 distro/fedora/25/entry
 create mode 100644 distro/fedora/25/install.sh
 create mode 100644 distro/fedora/25/isoinfo
 delete mode 100644 distro/fedora/entry
 create mode 100644 distro/fedora/entry.common
 delete mode 100644 distro/fedora/isoinfo

diff --git a/distro/fedora/24/entry b/distro/fedora/24/entry
new file mode 100644
index 0000000..2595253
--- /dev/null
+++ b/distro/fedora/24/entry
@@ -0,0 +1,2 @@
+version=24
+source distro/fedora/entry.common
diff --git a/distro/fedora/24/install.sh b/distro/fedora/24/install.sh
new file mode 100644
index 0000000..66acd61
--- /dev/null
+++ b/distro/fedora/24/install.sh
@@ -0,0 +1,3 @@
+version=24
+source distro/fedora/install.sh
+
diff --git a/distro/fedora/24/isoinfo b/distro/fedora/24/isoinfo
new file mode 100644
index 0000000..d2ecc7d
--- /dev/null
+++ b/distro/fedora/24/isoinfo
@@ -0,0 +1,8 @@
+ISONAME="$DISTRONAME 24 Workstation"
+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/25/entry b/distro/fedora/25/entry
new file mode 100644
index 0000000..e912200
--- /dev/null
+++ b/distro/fedora/25/entry
@@ -0,0 +1,2 @@
+version=25
+source distro/fedora/entry.common
diff --git a/distro/fedora/25/install.sh b/distro/fedora/25/install.sh
new file mode 100644
index 0000000..3655224
--- /dev/null
+++ b/distro/fedora/25/install.sh
@@ -0,0 +1,2 @@
+version=25
+source distro/fedora/install.sh
diff --git a/distro/fedora/25/isoinfo b/distro/fedora/25/isoinfo
new file mode 100644
index 0000000..3bfcc3f
--- /dev/null
+++ b/distro/fedora/25/isoinfo
@@ -0,0 +1,8 @@
+ISONAME="$DISTRONAME 25 Workstation"
+ISOURL=releases/25/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-25-1.3.iso
+SHA256=818017f42a2741cfaf20e94aecf6a63d1b995abfdaff5917df7218d0d89976a7
+
+mirrorlist=(
+https://mirrors.tuna.tsinghua.edu.cn/fedora
+http://mirrors.ustc.edu.cn/fedora/linux
+)
diff --git a/distro/fedora/entry b/distro/fedora/entry
deleted file mode 100644
index 8989c8c..0000000
--- a/distro/fedora/entry
+++ /dev/null
@@ -1,5 +0,0 @@
-TITLE='Fedora 24 x86_64'
-KERNEL=/liveusb-kernel/fedora/vmlinuz
-INITRD=/liveusb-kernel/fedora/initrd.img
-OPTION="root=live:UUID=$UUID ro rd.live.dir=liveusb-data/fedora quiet rhgb"
-X64=y
diff --git a/distro/fedora/entry.common b/distro/fedora/entry.common
new file mode 100644
index 0000000..0e4d45e
--- /dev/null
+++ b/distro/fedora/entry.common
@@ -0,0 +1,5 @@
+TITLE="Fedora $version x86_64"
+KERNEL=/liveusb-kernel/fedora/$version/vmlinuz
+INITRD=/liveusb-kernel/fedora/$version/initrd.img
+OPTION="root=live:UUID=$UUID ro rd.live.dir=liveusb-data/fedora/$version rd.live.image quiet"
+X64=y
diff --git a/distro/fedora/install.sh b/distro/fedora/install.sh
index 7920851..56528c3 100644
--- a/distro/fedora/install.sh
+++ b/distro/fedora/install.sh
@@ -1,9 +1,8 @@
 install_live() {
 	mount_iso
-	install -d "$DATADIR/fedora"
-	cp "$ISOMNT/LiveOS"/* "$DATADIR/fedora/"
-	install -d "$KERNELDIR/fedora"
-	cp "$ISOMNT/isolinux/vmlinuz" "$ISOMNT/isolinux/initrd.img" "$KERNELDIR/fedora"
+	install -d "$DATADIR/fedora/$version" "$KERNELDIR/fedora/$version"
+	cp "$ISOMNT/LiveOS"/* "$DATADIR/fedora/$version"
+	cp "$ISOMNT/isolinux/vmlinuz" "$ISOMNT/isolinux/initrd.img" "$KERNELDIR/fedora/$version"
 	umount_iso
 }
 
diff --git a/distro/fedora/isoinfo b/distro/fedora/isoinfo
deleted file mode 100644
index d2ecc7d..0000000
--- a/distro/fedora/isoinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-ISONAME="$DISTRONAME 24 Workstation"
-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
-)
-- 
cgit v1.2.3