summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIru Cai <mytbk920423@gmail.com>2016-08-08 22:22:46 +0800
committerIru Cai <mytbk920423@gmail.com>2016-08-08 22:22:46 +0800
commitd001d3ba8beb95e547f3960caacb363f1a99f827 (patch)
treec18ca26c2a29badef108f81d7c6f0fc689dd5add
parent78b1d0d7b85b02b2ba7fe72227f6d62208b23086 (diff)
downloadliveusb-builder-d001d3ba8beb95e547f3960caacb363f1a99f827.tar.xz
add entry file and remove grub.cfg
-rw-r--r--distro/arch/entry16
-rw-r--r--distro/arch/entry26
-rw-r--r--distro/arch/grub.cfg11
-rw-r--r--distro/fedora/entry5
-rw-r--r--distro/fedora/grub.cfg5
-rw-r--r--distro/mint/mate/64/entry5
-rw-r--r--distro/mint/mate/64/grub.cfg5
7 files changed, 22 insertions, 21 deletions
diff --git a/distro/arch/entry1 b/distro/arch/entry1
new file mode 100644
index 0000000..ec1c626
--- /dev/null
+++ b/distro/arch/entry1
@@ -0,0 +1,6 @@
+TITLE='Arch Linux x86_64'
+KERNEL=/liveusb-kernel/arch/x86_64/vmlinuz
+INITRD=(/liveusb-kernel/arch/intel_ucode.img
+ /liveusb-kernel/arch/x86_64/archiso.img)
+OPTION="archisodevice=/dev/disk/by-uuid/$UUID archisobasedir=liveusb-data/arch"
+X64=y
diff --git a/distro/arch/entry2 b/distro/arch/entry2
new file mode 100644
index 0000000..70363ce
--- /dev/null
+++ b/distro/arch/entry2
@@ -0,0 +1,6 @@
+TITLE='Arch Linux i686'
+KERNEL=/liveusb-kernel/arch/i686/vmlinuz
+INITRD=(/liveusb-kernel/arch/intel_ucode.img
+ /liveusb-kernel/arch/i686/archiso.img)
+OPTION="archisodevice=/dev/disk/by-uuid/$UUID archisobasedir=liveusb-data/arch"
+X64=n
diff --git a/distro/arch/grub.cfg b/distro/arch/grub.cfg
deleted file mode 100644
index 5d2ae63..0000000
--- a/distro/arch/grub.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-menuentry 'Arch Linux x86_64' {
- linux /liveusb-kernel/arch/x86_64/vmlinuz archisodevice=/dev/disk/by-uuid/$uuid archisobasedir=liveusb-data/arch
- initrd /liveusb-kernel/arch/intel_ucode.img
- initrd /liveusb-kernel/arch/x86_64/archiso.img
-}
-
-menuentry 'Arch Linux i686' {
- linux /liveusb-kernel/arch/i686/vmlinuz archisodevice=/dev/disk/by-uuid/$uuid archisobasedir=liveusb-data/arch
- initrd /liveusb-kernel/arch/intel_ucode.img
- initrd /liveusb-kernel/arch/i686/archiso.img
-}
diff --git a/distro/fedora/entry b/distro/fedora/entry
new file mode 100644
index 0000000..8989c8c
--- /dev/null
+++ b/distro/fedora/entry
@@ -0,0 +1,5 @@
+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/grub.cfg b/distro/fedora/grub.cfg
deleted file mode 100644
index b0dd30e..0000000
--- a/distro/fedora/grub.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-menuentry 'Fedora 24 x86_64' {
- linux /liveusb-kernel/fedora/vmlinuz root=live:UUID=$uuid ro rd.live.dir=liveusb-data/fedora quiet rhgb
- initrd /liveusb-kernel/fedora/initrd.img
-}
-
diff --git a/distro/mint/mate/64/entry b/distro/mint/mate/64/entry
new file mode 100644
index 0000000..b190746
--- /dev/null
+++ b/distro/mint/mate/64/entry
@@ -0,0 +1,5 @@
+TITLE='Linux Mint 18 x86_64 with MATE 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/grub.cfg b/distro/mint/mate/64/grub.cfg
deleted file mode 100644
index 31d161a..0000000
--- a/distro/mint/mate/64/grub.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-menuentry 'Linux Mint 18 x86_64 with MATE Desktop' {
- linux /liveusb-kernel/mint/64/vmlinuz file=/cdrom/preseed/linuxmint.seed boot=casper iso-scan/filename=/liveusb-data/mint/linuxmint-18-mate-64bit.iso quiet splash --
- initrd /liveusb-kernel/mint/64/initrd.lz
-}
-