|
 |
56d25d |
From 7d2fc73dad0e7000f7fbeb985bc6d80fbb0ea848 Mon Sep 17 00:00:00 2001
|
|
|
56d25d |
From: Peter Jones <pjones@redhat.com>
|
|
|
56d25d |
Date: Tue, 14 Apr 2015 14:34:10 -0400
|
|
|
56d25d |
Subject: [PATCH 32/41] Make the cases for 0cb78dab /actually work/, not just
|
|
|
56d25d |
not crash.
|
|
|
56d25d |
|
|
|
56d25d |
Resolves: rhbz#1204353
|
|
|
56d25d |
Resolves: rhbz#1204888
|
|
|
56d25d |
Resolves: rhbz#1206943
|
|
|
56d25d |
|
|
|
56d25d |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
56d25d |
---
|
|
|
56d25d |
grubby.c | 30 +++++++++++-----
|
|
|
56d25d |
test.sh | 3 ++
|
|
|
56d25d |
test/grub.14 | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
56d25d |
test/results/add/g1.7 | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
56d25d |
4 files changed, 218 insertions(+), 8 deletions(-)
|
|
|
56d25d |
create mode 100644 test/grub.14
|
|
|
56d25d |
create mode 100644 test/results/add/g1.7
|
|
|
56d25d |
|
|
|
56d25d |
diff --git a/grubby.c b/grubby.c
|
|
|
56d25d |
index f7209a9..e4358ad 100644
|
|
|
56d25d |
--- a/grubby.c
|
|
|
56d25d |
+++ b/grubby.c
|
|
|
56d25d |
@@ -217,6 +217,7 @@ struct configFileInfo grubConfigType = {
|
|
|
56d25d |
.mbHyperFirst = 1,
|
|
|
56d25d |
.mbInitRdIsModule = 1,
|
|
|
56d25d |
.mbAllowExtraInitRds = 1,
|
|
|
56d25d |
+ .titlePosition = 1,
|
|
|
56d25d |
};
|
|
|
56d25d |
|
|
|
56d25d |
struct keywordTypes grub2Keywords[] = {
|
|
|
56d25d |
@@ -586,6 +587,7 @@ struct configFileInfo eliloConfigType = {
|
|
|
56d25d |
.needsBootPrefix = 1,
|
|
|
56d25d |
.argsInQuotes = 1,
|
|
|
56d25d |
.mbConcatArgs = 1,
|
|
|
56d25d |
+ .titlePosition = 1,
|
|
|
56d25d |
};
|
|
|
56d25d |
|
|
|
56d25d |
struct configFileInfo liloConfigType = {
|
|
|
56d25d |
@@ -594,6 +596,7 @@ struct configFileInfo liloConfigType = {
|
|
|
56d25d |
.entryStart = LT_KERNEL,
|
|
|
56d25d |
.argsInQuotes = 1,
|
|
|
56d25d |
.maxTitleLength = 15,
|
|
|
56d25d |
+ .titlePosition = 1,
|
|
|
56d25d |
};
|
|
|
56d25d |
|
|
|
56d25d |
struct configFileInfo yabootConfigType = {
|
|
|
56d25d |
@@ -604,6 +607,7 @@ struct configFileInfo yabootConfigType = {
|
|
|
56d25d |
.argsInQuotes = 1,
|
|
|
56d25d |
.maxTitleLength = 15,
|
|
|
56d25d |
.mbAllowExtraInitRds = 1,
|
|
|
56d25d |
+ .titlePosition = 1,
|
|
|
56d25d |
};
|
|
|
56d25d |
|
|
|
56d25d |
struct configFileInfo siloConfigType = {
|
|
|
56d25d |
@@ -613,6 +617,7 @@ struct configFileInfo siloConfigType = {
|
|
|
56d25d |
.needsBootPrefix = 1,
|
|
|
56d25d |
.argsInQuotes = 1,
|
|
|
56d25d |
.maxTitleLength = 15,
|
|
|
56d25d |
+ .titlePosition = 1,
|
|
|
56d25d |
};
|
|
|
56d25d |
|
|
|
56d25d |
struct configFileInfo ziplConfigType = {
|
|
|
56d25d |
@@ -632,6 +637,7 @@ struct configFileInfo extlinuxConfigType = {
|
|
|
56d25d |
.maxTitleLength = 255,
|
|
|
56d25d |
.mbAllowExtraInitRds = 1,
|
|
|
56d25d |
.defaultIsUnquoted = 1,
|
|
|
56d25d |
+ .titlePosition = 1,
|
|
|
56d25d |
};
|
|
|
56d25d |
|
|
|
56d25d |
struct grubConfig {
|
|
|
56d25d |
@@ -820,12 +826,20 @@ static int isEntryStart(struct singleLine * line,
|
|
|
56d25d |
}
|
|
|
56d25d |
|
|
|
56d25d |
/* extract the title from within brackets (for zipl) */
|
|
|
56d25d |
-static char * extractTitle(struct singleLine * line) {
|
|
|
56d25d |
+static char * extractTitle(struct grubConfig *cfg, struct singleLine * line) {
|
|
|
56d25d |
/* bracketed title... let's extract it */
|
|
|
56d25d |
char * title = NULL;
|
|
|
56d25d |
+ if (cfg->cfi == &grub2ConfigType)
|
|
|
56d25d |
+ return grub2ExtractTitle(line);
|
|
|
56d25d |
if (line->type == LT_TITLE) {
|
|
|
56d25d |
- title = strdup(line->elements[0].item + 1);
|
|
|
56d25d |
- *(title + strlen(title) - 1) = '\0';
|
|
|
56d25d |
+ char *tmp = line->elements[cfg->cfi->titlePosition].item;
|
|
|
56d25d |
+ if (cfg->cfi->titleBracketed) {
|
|
|
56d25d |
+ tmp++;
|
|
|
56d25d |
+ title = strdup(tmp);
|
|
|
56d25d |
+ *(title + strlen(title) - 1) = '\0';
|
|
|
56d25d |
+ } else {
|
|
|
56d25d |
+ title = strdup(tmp);
|
|
|
56d25d |
+ }
|
|
|
56d25d |
} else if (line->type == LT_MENUENTRY)
|
|
|
56d25d |
title = strdup(line->elements[1].item);
|
|
|
56d25d |
else
|
|
|
56d25d |
@@ -1433,7 +1447,7 @@ static struct grubConfig * readConfig(const char * inName,
|
|
|
56d25d |
line->elements[1].item)) break;
|
|
|
56d25d |
} else if (line) {
|
|
|
56d25d |
if (!strcmp(defaultLine->elements[1].item,
|
|
|
56d25d |
- extractTitle(line))) break;
|
|
|
56d25d |
+ extractTitle(cfg, line))) break;
|
|
|
56d25d |
}
|
|
|
56d25d |
i++;
|
|
|
56d25d |
entry = NULL;
|
|
|
56d25d |
@@ -1484,7 +1498,7 @@ static void writeDefault(FILE * out, char * indent,
|
|
|
56d25d |
if (!line)
|
|
|
56d25d |
line = getLineByType(LT_TITLE, entry->lines);
|
|
|
56d25d |
if (line) {
|
|
|
56d25d |
- title = extractTitle(line);
|
|
|
56d25d |
+ title = extractTitle(cfg, line);
|
|
|
56d25d |
if (title)
|
|
|
56d25d |
cfg->cfi->setEnv(cfg->cfi, "saved_entry", title);
|
|
|
56d25d |
}
|
|
|
56d25d |
@@ -1522,7 +1536,7 @@ static void writeDefault(FILE * out, char * indent,
|
|
|
56d25d |
else if (line && (line->numElements == 1) &&
|
|
|
56d25d |
cfg->cfi->titleBracketed) {
|
|
|
56d25d |
fprintf(out, "%sdefault%s%s\n", indent, separator,
|
|
|
56d25d |
- extractTitle(line));
|
|
|
56d25d |
+ extractTitle(cfg, line));
|
|
|
56d25d |
}
|
|
|
56d25d |
}
|
|
|
56d25d |
}
|
|
|
56d25d |
@@ -3309,7 +3323,7 @@ int addMBInitrd(struct grubConfig * cfg, const char *newMBKernel,
|
|
|
56d25d |
if (!line)
|
|
|
56d25d |
continue;
|
|
|
56d25d |
|
|
|
56d25d |
- linetitle = extractTitle(line);
|
|
|
56d25d |
+ linetitle = extractTitle(cfg, line);
|
|
|
56d25d |
if (!linetitle)
|
|
|
56d25d |
continue;
|
|
|
56d25d |
if (strcmp(title, linetitle)) {
|
|
|
56d25d |
@@ -3363,7 +3377,7 @@ int updateInitrd(struct grubConfig * cfg, const char * image,
|
|
|
56d25d |
if (!line)
|
|
|
56d25d |
continue;
|
|
|
56d25d |
|
|
|
56d25d |
- linetitle = extractTitle(line);
|
|
|
56d25d |
+ linetitle = extractTitle(cfg, line);
|
|
|
56d25d |
if (!linetitle)
|
|
|
56d25d |
continue;
|
|
|
56d25d |
if (strcmp(title, linetitle)) {
|
|
|
56d25d |
diff --git a/test.sh b/test.sh
|
|
|
56d25d |
index fb13033..30115d1 100755
|
|
|
56d25d |
--- a/test.sh
|
|
|
56d25d |
+++ b/test.sh
|
|
|
56d25d |
@@ -269,6 +269,9 @@ grubTest grub.13 setdefaultindex/g.13.0 --set-default-index=0
|
|
|
56d25d |
grubTest grub.13 setdefaultindex/g.13.1 --set-default-index=1
|
|
|
56d25d |
grubTest grub.13 setdefaultindex/g.13.9 --set-default-index=9
|
|
|
56d25d |
|
|
|
56d25d |
+testing="GRUB add initrd"
|
|
|
56d25d |
+grubTest grub.14 add/g1.7 --boot-filesystem=/ --update-kernel=/vmlinuz-4.0.0-0.rc4.git1.4.fc23.x86_64 --initrd /initramfs-4.0.0-0.rc4.git1.4.fc23.x86_64.img '--args= LANG=en_US.UTF-8' '--title=Fedora (4.0.0-0.rc4.git1.4.fc23.x86_64) 23 (Rawhide)'
|
|
|
56d25d |
+
|
|
|
56d25d |
testing="GRUB display default index"
|
|
|
56d25d |
grubDisplayTest grub.1 defaultindex/0 --default-index
|
|
|
56d25d |
grubDisplayTest grub.2 defaultindex/0 --default-index
|
|
|
56d25d |
diff --git a/test/grub.14 b/test/grub.14
|
|
|
56d25d |
new file mode 100644
|
|
|
56d25d |
index 0000000..5c0b9b3
|
|
|
56d25d |
--- /dev/null
|
|
|
56d25d |
+++ b/test/grub.14
|
|
|
56d25d |
@@ -0,0 +1,96 @@
|
|
|
56d25d |
+# grub.conf generated by anaconda
|
|
|
56d25d |
+#
|
|
|
56d25d |
+# Note that you do not have to rerun grub after making changes to this file
|
|
|
56d25d |
+# NOTICE: You have a partition. This means that
|
|
|
56d25d |
+# all kernel and initrd paths are relative to /, eg.
|
|
|
56d25d |
+# root (hd0,0)
|
|
|
56d25d |
+# kernel /vmlinuz-version ro root=/dev/d2/root
|
|
|
56d25d |
+# initrd /initrd-version.img
|
|
|
56d25d |
+#boot=/dev/hda
|
|
|
56d25d |
+timeout=5
|
|
|
56d25d |
+splashimage=(hd0,0)/grub/splash.xpm.gz
|
|
|
56d25d |
+default=0
|
|
|
56d25d |
+hiddenmenu
|
|
|
56d25d |
+title Fedora (4.0.0-0.rc4.git1.4.fc23.x86_64) 23 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-4.0.0-0.rc4.git1.4.fc23.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+title Fedora (4.0.0-0.rc4.git0.1.fc23.x86_64) 23 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-4.0.0-0.rc4.git0.1.fc23.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-4.0.0-0.rc4.git0.1.fc23.x86_64.img
|
|
|
56d25d |
+title Fedora (4.0.0-0.rc1.git1.2.fc23.x86_64) 23 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-4.0.0-0.rc1.git1.2.fc23.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-4.0.0-0.rc1.git1.2.fc23.x86_64.img
|
|
|
56d25d |
+title Fedora (4.0.0-0.rc1.git0.1.fc23.x86_64) 23 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-4.0.0-0.rc1.git0.1.fc23.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-4.0.0-0.rc1.git0.1.fc23.x86_64.img
|
|
|
56d25d |
+title Fedora (3.20.0-0.rc0.git9.2.fc23.x86_64) 23 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.20.0-0.rc0.git9.2.fc23.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.20.0-0.rc0.git9.2.fc23.x86_64.img
|
|
|
56d25d |
+title Fedora (3.20.0-0.rc0.git6.2.fc23.x86_64) 23 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.20.0-0.rc0.git6.2.fc23.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.20.0-0.rc0.git6.2.fc23.x86_64.img
|
|
|
56d25d |
+title Fedora (3.19.0-1.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.19.0-1.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.19.0-1.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.19.0-0.rc7.git1.2.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.19.0-0.rc7.git1.2.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.19.0-0.rc7.git1.2.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.19.0-0.rc7.git0.1.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.19.0-0.rc7.git0.1.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.19.0-0.rc7.git0.1.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.19.0-0.rc6.git0.1.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.19.0-0.rc6.git0.1.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.19.0-0.rc6.git0.1.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.19.0-0.rc5.git0.1.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.19.0-0.rc5.git0.1.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.19.0-0.rc5.git0.1.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.19.0-0.rc4.git2.2.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.19.0-0.rc4.git2.2.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.19.0-0.rc4.git2.2.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.19.0-0.rc4.git0.1.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.19.0-0.rc4.git0.1.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.19.0-0.rc4.git0.1.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.19.0-0.rc3.git0.1.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.19.0-0.rc3.git0.1.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.19.0-0.rc3.git0.1.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.18.1-2.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.18.1-2.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.18.1-2.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.17.1-302.fc21.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.17.1-302.fc21.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.17.1-302.fc21.x86_64.img
|
|
|
56d25d |
+title Fedora 20 Rescue 4b741960432e833443a6bc004563501d (3.10.0-0.rc4.git0.1.fc20.x86_64)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-0-rescue-4b741960432e833443a6bc004563501d ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-0-rescue-4b741960432e833443a6bc004563501d.img
|
|
|
56d25d |
+title Fedora 20 Rescue 4b741960432e833443a6bc004563501d (3.9.0-0.rc4.git0.1.fc20.x86_64)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-0-rescue-4b741960432e833443a6bc004563501d ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-0-rescue-4b741960432e833443a6bc004563501d.img
|
|
|
56d25d |
+title Memtest86+ (4.20)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /elf-memtest86+-4.20
|
|
|
56d25d |
+title Fedora (2.6.29.5-191.fc11.x86_64)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-2.6.29.5-191.fc11.x86_64 ro root=/dev/d2/rescue64
|
|
|
56d25d |
+ initrd /initrd-2.6.29.5-191.fc11.x86_64.img
|
|
|
56d25d |
+title install
|
|
|
56d25d |
+ kernel /f10vz
|
|
|
56d25d |
+ initrd /f10ird.img
|
|
|
56d25d |
+title gittest
|
|
|
56d25d |
+ kernel /gittest
|
|
|
56d25d |
diff --git a/test/results/add/g1.7 b/test/results/add/g1.7
|
|
|
56d25d |
new file mode 100644
|
|
|
56d25d |
index 0000000..dc77c0f
|
|
|
56d25d |
--- /dev/null
|
|
|
56d25d |
+++ b/test/results/add/g1.7
|
|
|
56d25d |
@@ -0,0 +1,97 @@
|
|
|
56d25d |
+# grub.conf generated by anaconda
|
|
|
56d25d |
+#
|
|
|
56d25d |
+# Note that you do not have to rerun grub after making changes to this file
|
|
|
56d25d |
+# NOTICE: You have a partition. This means that
|
|
|
56d25d |
+# all kernel and initrd paths are relative to /, eg.
|
|
|
56d25d |
+# root (hd0,0)
|
|
|
56d25d |
+# kernel /vmlinuz-version ro root=/dev/d2/root
|
|
|
56d25d |
+# initrd /initrd-version.img
|
|
|
56d25d |
+#boot=/dev/hda
|
|
|
56d25d |
+timeout=5
|
|
|
56d25d |
+splashimage=(hd0,0)/grub/splash.xpm.gz
|
|
|
56d25d |
+default=0
|
|
|
56d25d |
+hiddenmenu
|
|
|
56d25d |
+title Fedora (4.0.0-0.rc4.git1.4.fc23.x86_64) 23 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-4.0.0-0.rc4.git1.4.fc23.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-4.0.0-0.rc4.git1.4.fc23.x86_64.img
|
|
|
56d25d |
+title Fedora (4.0.0-0.rc4.git0.1.fc23.x86_64) 23 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-4.0.0-0.rc4.git0.1.fc23.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-4.0.0-0.rc4.git0.1.fc23.x86_64.img
|
|
|
56d25d |
+title Fedora (4.0.0-0.rc1.git1.2.fc23.x86_64) 23 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-4.0.0-0.rc1.git1.2.fc23.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-4.0.0-0.rc1.git1.2.fc23.x86_64.img
|
|
|
56d25d |
+title Fedora (4.0.0-0.rc1.git0.1.fc23.x86_64) 23 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-4.0.0-0.rc1.git0.1.fc23.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-4.0.0-0.rc1.git0.1.fc23.x86_64.img
|
|
|
56d25d |
+title Fedora (3.20.0-0.rc0.git9.2.fc23.x86_64) 23 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.20.0-0.rc0.git9.2.fc23.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.20.0-0.rc0.git9.2.fc23.x86_64.img
|
|
|
56d25d |
+title Fedora (3.20.0-0.rc0.git6.2.fc23.x86_64) 23 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.20.0-0.rc0.git6.2.fc23.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.20.0-0.rc0.git6.2.fc23.x86_64.img
|
|
|
56d25d |
+title Fedora (3.19.0-1.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.19.0-1.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.19.0-1.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.19.0-0.rc7.git1.2.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.19.0-0.rc7.git1.2.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.19.0-0.rc7.git1.2.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.19.0-0.rc7.git0.1.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.19.0-0.rc7.git0.1.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.19.0-0.rc7.git0.1.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.19.0-0.rc6.git0.1.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.19.0-0.rc6.git0.1.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.19.0-0.rc6.git0.1.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.19.0-0.rc5.git0.1.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.19.0-0.rc5.git0.1.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.19.0-0.rc5.git0.1.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.19.0-0.rc4.git2.2.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.19.0-0.rc4.git2.2.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.19.0-0.rc4.git2.2.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.19.0-0.rc4.git0.1.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.19.0-0.rc4.git0.1.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.19.0-0.rc4.git0.1.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.19.0-0.rc3.git0.1.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.19.0-0.rc3.git0.1.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.19.0-0.rc3.git0.1.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.18.1-2.fc22.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.18.1-2.fc22.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.18.1-2.fc22.x86_64.img
|
|
|
56d25d |
+title Fedora (3.17.1-302.fc21.x86_64) 22 (Rawhide)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-3.17.1-302.fc21.x86_64 ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-3.17.1-302.fc21.x86_64.img
|
|
|
56d25d |
+title Fedora 20 Rescue 4b741960432e833443a6bc004563501d (3.10.0-0.rc4.git0.1.fc20.x86_64)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-0-rescue-4b741960432e833443a6bc004563501d ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-0-rescue-4b741960432e833443a6bc004563501d.img
|
|
|
56d25d |
+title Fedora 20 Rescue 4b741960432e833443a6bc004563501d (3.9.0-0.rc4.git0.1.fc20.x86_64)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-0-rescue-4b741960432e833443a6bc004563501d ro root=/dev/sda1 SYSFONT=latarcyrheb-sun16 LANG=en_US.UTF-8 KEYTABLE=us rd_plytheme=charge
|
|
|
56d25d |
+ initrd /initramfs-0-rescue-4b741960432e833443a6bc004563501d.img
|
|
|
56d25d |
+title Memtest86+ (4.20)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /elf-memtest86+-4.20
|
|
|
56d25d |
+title Fedora (2.6.29.5-191.fc11.x86_64)
|
|
|
56d25d |
+ root (hd0,0)
|
|
|
56d25d |
+ kernel /vmlinuz-2.6.29.5-191.fc11.x86_64 ro root=/dev/d2/rescue64
|
|
|
56d25d |
+ initrd /initrd-2.6.29.5-191.fc11.x86_64.img
|
|
|
56d25d |
+title install
|
|
|
56d25d |
+ kernel /f10vz
|
|
|
56d25d |
+ initrd /f10ird.img
|
|
|
56d25d |
+title gittest
|
|
|
56d25d |
+ kernel /gittest
|
|
|
56d25d |
--
|
|
|
56d25d |
2.4.3
|
|
|
56d25d |
|