You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
1871 lines
55 KiB
1871 lines
55 KiB
From e319f73ca691b9cc138def3a9c19f1cb6e581475 Mon Sep 17 00:00:00 2001 |
|
From: Gene Czarcinski <gczarcinski@gmail.com> |
|
Date: Mon, 9 Jun 2014 21:11:37 -0400 |
|
Subject: [PATCH 4/8] Add tests for btrfs support |
|
|
|
The tests performed are: |
|
- add kernel with /boot on btrfs subvol (20) |
|
- update kernel/add initrd with /boot on btrfs subvol (21) |
|
- add kernel with rootfs on btrfs subvol and /boot a directory (22) |
|
- update kernel/add initrd with rootfs on btrfs subvol and |
|
/boot a directory (23) |
|
- add kernel and initrd with /boot on btrfs subvol (24) |
|
- add kernel and initrd with rootfs on btrfs subvol and /boot |
|
a directory (25) |
|
--- |
|
test.sh | 40 +++++++ |
|
test/grub2-support_files/g2.20-mounts | 2 + |
|
test/grub2-support_files/g2.21-mounts | 1 + |
|
test/grub2-support_files/g2.22-mounts | 1 + |
|
test/grub2-support_files/g2.23-mounts | 1 + |
|
test/grub2-support_files/g2.24-mounts | 1 + |
|
test/grub2-support_files/g2.25-mounts | 1 + |
|
test/grub2.20 | 126 ++++++++++++++++++++++ |
|
test/grub2.21 | 140 +++++++++++++++++++++++++ |
|
test/grub2.22 | 128 +++++++++++++++++++++++ |
|
test/grub2.23 | 143 +++++++++++++++++++++++++ |
|
test/grub2.24 | 126 ++++++++++++++++++++++ |
|
test/grub2.25 | 128 +++++++++++++++++++++++ |
|
test/results/add/g2-1.20 | 140 +++++++++++++++++++++++++ |
|
test/results/add/g2-1.21 | 141 +++++++++++++++++++++++++ |
|
test/results/add/g2-1.22 | 143 +++++++++++++++++++++++++ |
|
test/results/add/g2-1.23 | 144 ++++++++++++++++++++++++++ |
|
test/results/add/g2-1.24 | 141 +++++++++++++++++++++++++ |
|
test/results/add/g2-1.25 | 144 ++++++++++++++++++++++++++ |
|
19 files changed, 1691 insertions(+) |
|
create mode 100644 test/grub2-support_files/g2.20-mounts |
|
create mode 120000 test/grub2-support_files/g2.21-mounts |
|
create mode 100644 test/grub2-support_files/g2.22-mounts |
|
create mode 120000 test/grub2-support_files/g2.23-mounts |
|
create mode 120000 test/grub2-support_files/g2.24-mounts |
|
create mode 120000 test/grub2-support_files/g2.25-mounts |
|
create mode 100644 test/grub2.20 |
|
create mode 100644 test/grub2.21 |
|
create mode 100644 test/grub2.22 |
|
create mode 100644 test/grub2.23 |
|
create mode 100644 test/grub2.24 |
|
create mode 100644 test/grub2.25 |
|
create mode 100644 test/results/add/g2-1.20 |
|
create mode 100644 test/results/add/g2-1.21 |
|
create mode 100644 test/results/add/g2-1.22 |
|
create mode 100644 test/results/add/g2-1.23 |
|
create mode 100644 test/results/add/g2-1.24 |
|
create mode 100644 test/results/add/g2-1.25 |
|
|
|
diff --git a/test.sh b/test.sh |
|
index 6379698c6de..c35bfca1c89 100755 |
|
--- a/test.sh |
|
+++ b/test.sh |
|
@@ -629,6 +629,46 @@ if [ "$testgrub2" == "y" ]; then |
|
--initrd /boot/initramfs-0-rescue-5a94251776a14678911d4ae0949500f5.img \ |
|
--copy-default --title "Fedora 21 Rescue" --args=root=/fooooo \ |
|
--remove-kernel=wtf --boot-filesystem=/boot/ |
|
+ |
|
+ testing="GRUB2 add kernel with boot on btrfs subvol" |
|
+ grub2Test grub2.20 add/g2-1.20 --add-kernel=/boot/new-kernel.img \ |
|
+ --title='title' \ |
|
+ --boot-filesystem=/boot/ \ |
|
+ --copy-default \ |
|
+ --mounts='test/grub2-support_files/g2.20-mounts' |
|
+ |
|
+ testing="GRUB2 add initrd with boot on btrfs subvol" |
|
+ grub2Test grub2.21 add/g2-1.21 --update-kernel=/boot/new-kernel.img \ |
|
+ --initrd=/boot/new-initrd --boot-filesystem=/boot/ \ |
|
+ --mounts='test/grub2-support_files/g2.21-mounts' |
|
+ |
|
+ testing="GRUB2 add kernel with rootfs on btrfs subvol and boot directory" |
|
+ grub2Test grub2.22 add/g2-1.22 --add-kernel=/boot/new-kernel.img \ |
|
+ --title='title' \ |
|
+ --boot-filesystem= \ |
|
+ --copy-default \ |
|
+ --mounts='test/grub2-support_files/g2.22-mounts' |
|
+ |
|
+ testing="GRUB2 add initrd with rootfs on btrfs subvol and boot directory" |
|
+ grub2Test grub2.23 add/g2-1.23 --update-kernel=/boot/new-kernel.img \ |
|
+ --initrd=/boot/new-initrd --boot-filesystem= \ |
|
+ --mounts='test/grub2-support_files/g2.23-mounts' |
|
+ |
|
+ testing="GRUB2 add kernel and initrd with boot on btrfs subvol" |
|
+ grub2Test grub2.24 add/g2-1.24 --add-kernel=/boot/new-kernel.img \ |
|
+ --title='title' \ |
|
+ --initrd=/boot/new-initrd \ |
|
+ --boot-filesystem=/boot/ \ |
|
+ --copy-default \ |
|
+ --mounts='test/grub2-support_files/g2.24-mounts' |
|
+ |
|
+ testing="GRUB2 add kernel and initrd with rootfs on btrfs subvol and boot directory" |
|
+ grub2Test grub2.25 add/g2-1.25 --add-kernel=/boot/new-kernel.img \ |
|
+ --title='title' \ |
|
+ --initrd=/boot/new-initrd \ |
|
+ --boot-filesystem= \ |
|
+ --copy-default \ |
|
+ --mounts='test/grub2-support_files/g2.25-mounts' |
|
fi |
|
fi |
|
|
|
diff --git a/test/grub2-support_files/g2.20-mounts b/test/grub2-support_files/g2.20-mounts |
|
new file mode 100644 |
|
index 00000000000..00bdb48e4ab |
|
--- /dev/null |
|
+++ b/test/grub2-support_files/g2.20-mounts |
|
@@ -0,0 +1,2 @@ |
|
+/dev/sda / btrfs subvol=/root6,defaults 0 0 |
|
+/dev/sda /boot btrfs subvol=/boot6,defaults 0 0 |
|
diff --git a/test/grub2-support_files/g2.21-mounts b/test/grub2-support_files/g2.21-mounts |
|
new file mode 120000 |
|
index 00000000000..42ef3fd4272 |
|
--- /dev/null |
|
+++ b/test/grub2-support_files/g2.21-mounts |
|
@@ -0,0 +1 @@ |
|
+g2.20-mounts |
|
\ No newline at end of file |
|
diff --git a/test/grub2-support_files/g2.22-mounts b/test/grub2-support_files/g2.22-mounts |
|
new file mode 100644 |
|
index 00000000000..5b664e72519 |
|
--- /dev/null |
|
+++ b/test/grub2-support_files/g2.22-mounts |
|
@@ -0,0 +1 @@ |
|
+/dev/sda / btrfs defaults,subvol=/root4,ro 0 0 |
|
diff --git a/test/grub2-support_files/g2.23-mounts b/test/grub2-support_files/g2.23-mounts |
|
new file mode 120000 |
|
index 00000000000..74f036fc4a3 |
|
--- /dev/null |
|
+++ b/test/grub2-support_files/g2.23-mounts |
|
@@ -0,0 +1 @@ |
|
+g2.22-mounts |
|
\ No newline at end of file |
|
diff --git a/test/grub2-support_files/g2.24-mounts b/test/grub2-support_files/g2.24-mounts |
|
new file mode 120000 |
|
index 00000000000..42ef3fd4272 |
|
--- /dev/null |
|
+++ b/test/grub2-support_files/g2.24-mounts |
|
@@ -0,0 +1 @@ |
|
+g2.20-mounts |
|
\ No newline at end of file |
|
diff --git a/test/grub2-support_files/g2.25-mounts b/test/grub2-support_files/g2.25-mounts |
|
new file mode 120000 |
|
index 00000000000..74f036fc4a3 |
|
--- /dev/null |
|
+++ b/test/grub2-support_files/g2.25-mounts |
|
@@ -0,0 +1 @@ |
|
+g2.22-mounts |
|
\ No newline at end of file |
|
diff --git a/test/grub2.20 b/test/grub2.20 |
|
new file mode 100644 |
|
index 00000000000..23b75fa8d3c |
|
--- /dev/null |
|
+++ b/test/grub2.20 |
|
@@ -0,0 +1,126 @@ |
|
+# |
|
+# DO NOT EDIT THIS FILE |
|
+# |
|
+# It is automatically generated by grub2-mkconfig using templates |
|
+# from /etc/grub.d and settings from /etc/default/grub |
|
+# |
|
+ |
|
+### BEGIN /etc/grub.d/00_header ### |
|
+set pager=1 |
|
+ |
|
+if [ -s $prefix/grubenv ]; then |
|
+ load_env |
|
+fi |
|
+if [ "${next_entry}" ] ; then |
|
+ set default="${next_entry}" |
|
+ set next_entry= |
|
+ save_env next_entry |
|
+ set boot_once=true |
|
+else |
|
+ set default="${saved_entry}" |
|
+fi |
|
+ |
|
+if [ x"${feature_menuentry_id}" = xy ]; then |
|
+ menuentry_id_option="--id" |
|
+else |
|
+ menuentry_id_option="" |
|
+fi |
|
+ |
|
+export menuentry_id_option |
|
+ |
|
+if [ "${prev_saved_entry}" ]; then |
|
+ set saved_entry="${prev_saved_entry}" |
|
+ save_env saved_entry |
|
+ set prev_saved_entry= |
|
+ save_env prev_saved_entry |
|
+ set boot_once=true |
|
+fi |
|
+ |
|
+function savedefault { |
|
+ if [ -z "${boot_once}" ]; then |
|
+ saved_entry="${chosen}" |
|
+ save_env saved_entry |
|
+ fi |
|
+} |
|
+ |
|
+function load_video { |
|
+ if [ x$feature_all_video_module = xy ]; then |
|
+ insmod all_video |
|
+ else |
|
+ insmod efi_gop |
|
+ insmod efi_uga |
|
+ insmod ieee1275_fb |
|
+ insmod vbe |
|
+ insmod vga |
|
+ insmod video_bochs |
|
+ insmod video_cirrus |
|
+ fi |
|
+} |
|
+ |
|
+terminal_output console |
|
+if [ x$feature_timeout_style = xy ] ; then |
|
+ set timeout_style=menu |
|
+ set timeout=15 |
|
+# Fallback normal timeout code in case the timeout_style feature is |
|
+# unavailable. |
|
+else |
|
+ set timeout=15 |
|
+fi |
|
+### END /etc/grub.d/00_header ### |
|
+ |
|
+### BEGIN /etc/grub.d/10_linux ### |
|
+menuentry 'Fedora, with Linux 3.15.0-0.rc7.git2.1.fc21.x86_64' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ fi |
|
+ linux16 /boot6/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=1bab15a4-93ce-4373-8d7d-b77f907fd0c6 ro rootflags=subvol=root6 rhgb quiet |
|
+ initrd16 /boot6/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img |
|
+} |
|
+menuentry 'Fedora, with Linux 0-rescue-81378818f7a24478b496ebef90e1dd69' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ fi |
|
+ linux16 /boot6/vmlinuz-0-rescue-81378818f7a24478b496ebef90e1dd69 root=UUID=1bab15a4-93ce-4373-8d7d-b77f907fd0c6 ro rootflags=subvol=root6 rhgb quiet |
|
+ initrd16 /boot6/initramfs-0-rescue-81378818f7a24478b496ebef90e1dd69.img |
|
+} |
|
+ |
|
+### END /etc/grub.d/10_linux ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### END /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_ppc_terminfo ### |
|
+### END /etc/grub.d/20_ppc_terminfo ### |
|
+ |
|
+### BEGIN /etc/grub.d/30_os-prober ### |
|
+### END /etc/grub.d/30_os-prober ### |
|
+ |
|
+### BEGIN /etc/grub.d/40_custom ### |
|
+# This file provides an easy way to add custom menu entries. Simply type the |
|
+# menu entries you want to add after this comment. Be careful not to change |
|
+# the 'exec tail' line above. |
|
+### END /etc/grub.d/40_custom ### |
|
+ |
|
+### BEGIN /etc/grub.d/41_custom ### |
|
+if [ -f ${config_directory}/custom.cfg ]; then |
|
+ source ${config_directory}/custom.cfg |
|
+elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then |
|
+ source $prefix/custom.cfg; |
|
+fi |
|
+### END /etc/grub.d/41_custom ### |
|
diff --git a/test/grub2.21 b/test/grub2.21 |
|
new file mode 100644 |
|
index 00000000000..579c2f6744a |
|
--- /dev/null |
|
+++ b/test/grub2.21 |
|
@@ -0,0 +1,140 @@ |
|
+# |
|
+# DO NOT EDIT THIS FILE |
|
+# |
|
+# It is automatically generated by grub2-mkconfig using templates |
|
+# from /etc/grub.d and settings from /etc/default/grub |
|
+# |
|
+ |
|
+### BEGIN /etc/grub.d/00_header ### |
|
+set pager=1 |
|
+ |
|
+if [ -s $prefix/grubenv ]; then |
|
+ load_env |
|
+fi |
|
+if [ "${next_entry}" ] ; then |
|
+ set default="${next_entry}" |
|
+ set next_entry= |
|
+ save_env next_entry |
|
+ set boot_once=true |
|
+else |
|
+ set default="${saved_entry}" |
|
+fi |
|
+ |
|
+if [ x"${feature_menuentry_id}" = xy ]; then |
|
+ menuentry_id_option="--id" |
|
+else |
|
+ menuentry_id_option="" |
|
+fi |
|
+ |
|
+export menuentry_id_option |
|
+ |
|
+if [ "${prev_saved_entry}" ]; then |
|
+ set saved_entry="${prev_saved_entry}" |
|
+ save_env saved_entry |
|
+ set prev_saved_entry= |
|
+ save_env prev_saved_entry |
|
+ set boot_once=true |
|
+fi |
|
+ |
|
+function savedefault { |
|
+ if [ -z "${boot_once}" ]; then |
|
+ saved_entry="${chosen}" |
|
+ save_env saved_entry |
|
+ fi |
|
+} |
|
+ |
|
+function load_video { |
|
+ if [ x$feature_all_video_module = xy ]; then |
|
+ insmod all_video |
|
+ else |
|
+ insmod efi_gop |
|
+ insmod efi_uga |
|
+ insmod ieee1275_fb |
|
+ insmod vbe |
|
+ insmod vga |
|
+ insmod video_bochs |
|
+ insmod video_cirrus |
|
+ fi |
|
+} |
|
+ |
|
+terminal_output console |
|
+if [ x$feature_timeout_style = xy ] ; then |
|
+ set timeout_style=menu |
|
+ set timeout=15 |
|
+# Fallback normal timeout code in case the timeout_style feature is |
|
+# unavailable. |
|
+else |
|
+ set timeout=15 |
|
+fi |
|
+### END /etc/grub.d/00_header ### |
|
+ |
|
+### BEGIN /etc/grub.d/10_linux ### |
|
+menuentry 'title' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ fi |
|
+ linux16 /boot6/new-kernel.img root=UUID=1bab15a4-93ce-4373-8d7d-b77f907fd0c6 ro rootflags=subvol=root6 rhgb quiet |
|
+} |
|
+menuentry 'Fedora, with Linux 3.15.0-0.rc7.git2.1.fc21.x86_64' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ fi |
|
+ linux16 /boot6/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=1bab15a4-93ce-4373-8d7d-b77f907fd0c6 ro rootflags=subvol=root6 rhgb quiet |
|
+ initrd16 /boot6/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img |
|
+} |
|
+menuentry 'Fedora, with Linux 0-rescue-81378818f7a24478b496ebef90e1dd69' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ fi |
|
+ linux16 /boot6/vmlinuz-0-rescue-81378818f7a24478b496ebef90e1dd69 root=UUID=1bab15a4-93ce-4373-8d7d-b77f907fd0c6 ro rootflags=subvol=root6 rhgb quiet |
|
+ initrd16 /boot6/initramfs-0-rescue-81378818f7a24478b496ebef90e1dd69.img |
|
+} |
|
+ |
|
+### END /etc/grub.d/10_linux ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### END /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_ppc_terminfo ### |
|
+### END /etc/grub.d/20_ppc_terminfo ### |
|
+ |
|
+### BEGIN /etc/grub.d/30_os-prober ### |
|
+### END /etc/grub.d/30_os-prober ### |
|
+ |
|
+### BEGIN /etc/grub.d/40_custom ### |
|
+# This file provides an easy way to add custom menu entries. Simply type the |
|
+# menu entries you want to add after this comment. Be careful not to change |
|
+# the 'exec tail' line above. |
|
+### END /etc/grub.d/40_custom ### |
|
+ |
|
+### BEGIN /etc/grub.d/41_custom ### |
|
+if [ -f ${config_directory}/custom.cfg ]; then |
|
+ source ${config_directory}/custom.cfg |
|
+elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then |
|
+ source $prefix/custom.cfg; |
|
+fi |
|
+### END /etc/grub.d/41_custom ### |
|
diff --git a/test/grub2.22 b/test/grub2.22 |
|
new file mode 100644 |
|
index 00000000000..9466bc35153 |
|
--- /dev/null |
|
+++ b/test/grub2.22 |
|
@@ -0,0 +1,128 @@ |
|
+# |
|
+# DO NOT EDIT THIS FILE |
|
+# |
|
+# It is automatically generated by grub2-mkconfig using templates |
|
+# from /etc/grub.d and settings from /etc/default/grub |
|
+# |
|
+ |
|
+### BEGIN /etc/grub.d/00_header ### |
|
+set pager=1 |
|
+ |
|
+if [ -s $prefix/grubenv ]; then |
|
+ load_env |
|
+fi |
|
+if [ "${next_entry}" ] ; then |
|
+ set default="${next_entry}" |
|
+ set next_entry= |
|
+ save_env next_entry |
|
+ set boot_once=true |
|
+else |
|
+ set default="${saved_entry}" |
|
+fi |
|
+ |
|
+if [ x"${feature_menuentry_id}" = xy ]; then |
|
+ menuentry_id_option="--id" |
|
+else |
|
+ menuentry_id_option="" |
|
+fi |
|
+ |
|
+export menuentry_id_option |
|
+ |
|
+if [ "${prev_saved_entry}" ]; then |
|
+ set saved_entry="${prev_saved_entry}" |
|
+ save_env saved_entry |
|
+ set prev_saved_entry= |
|
+ save_env prev_saved_entry |
|
+ set boot_once=true |
|
+fi |
|
+ |
|
+function savedefault { |
|
+ if [ -z "${boot_once}" ]; then |
|
+ saved_entry="${chosen}" |
|
+ save_env saved_entry |
|
+ fi |
|
+} |
|
+ |
|
+function load_video { |
|
+ if [ x$feature_all_video_module = xy ]; then |
|
+ insmod all_video |
|
+ else |
|
+ insmod efi_gop |
|
+ insmod efi_uga |
|
+ insmod ieee1275_fb |
|
+ insmod vbe |
|
+ insmod vga |
|
+ insmod video_bochs |
|
+ insmod video_cirrus |
|
+ fi |
|
+} |
|
+ |
|
+terminal_output console |
|
+if [ x$feature_timeout_style = xy ] ; then |
|
+ set timeout_style=menu |
|
+ set timeout=15 |
|
+# Fallback normal timeout code in case the timeout_style feature is |
|
+# unavailable. |
|
+else |
|
+ set timeout=15 |
|
+fi |
|
+### END /etc/grub.d/00_header ### |
|
+ |
|
+### BEGIN /etc/grub.d/10_linux ### |
|
+menuentry 'Fedora, with Linux 3.15.0-0.rc7.git2.1.fc21.x86_64' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' --hint='hd1,msdos3' 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ fi |
|
+ linux16 /root4/boot/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=54c6abc2-b1e7-4987-aa73-c79927be69eb ro rootflags=subvol=root4 rhgb quiet |
|
+ initrd16 /root4/boot/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img |
|
+} |
|
+menuentry 'Fedora, with Linux 0-rescue-20e7024f4e9c4b70b1042b91acd434c6' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' --hint='hd1,msdos3' 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ fi |
|
+ linux16 /root4/boot/vmlinuz-0-rescue-20e7024f4e9c4b70b1042b91acd434c6 root=UUID=54c6abc2-b1e7-4987-aa73-c79927be69eb ro rootflags=subvol=root4 rhgb quiet |
|
+ initrd16 /root4/boot/initramfs-0-rescue-20e7024f4e9c4b70b1042b91acd434c6.img |
|
+} |
|
+ |
|
+### END /etc/grub.d/10_linux ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### END /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_ppc_terminfo ### |
|
+### END /etc/grub.d/20_ppc_terminfo ### |
|
+ |
|
+### BEGIN /etc/grub.d/30_os-prober ### |
|
+### |
|
+ |
|
+### BEGIN /etc/grub.d/40_custom ### |
|
+# This file provides an easy way to add custom menu entries. Simply type the |
|
+# menu entries you want to add after this comment. Be careful not to change |
|
+# the 'exec tail' line above. |
|
+### END /etc/grub.d/40_custom ### |
|
+ |
|
+### BEGIN /etc/grub.d/41_custom ### |
|
+if [ -f ${config_directory}/custom.cfg ]; then |
|
+ source ${config_directory}/custom.cfg |
|
+elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then |
|
+ source $prefix/custom.cfg; |
|
+fi |
|
+### END /etc/grub.d/41_custom ### |
|
diff --git a/test/grub2.23 b/test/grub2.23 |
|
new file mode 100644 |
|
index 00000000000..5cb240fc1de |
|
--- /dev/null |
|
+++ b/test/grub2.23 |
|
@@ -0,0 +1,143 @@ |
|
+# |
|
+# DO NOT EDIT THIS FILE |
|
+# |
|
+# It is automatically generated by grub2-mkconfig using templates |
|
+# from /etc/grub.d and settings from /etc/default/grub |
|
+# |
|
+ |
|
+### BEGIN /etc/grub.d/00_header ### |
|
+set pager=1 |
|
+ |
|
+if [ -s $prefix/grubenv ]; then |
|
+ load_env |
|
+fi |
|
+if [ "${next_entry}" ] ; then |
|
+ set default="${next_entry}" |
|
+ set next_entry= |
|
+ save_env next_entry |
|
+ set boot_once=true |
|
+else |
|
+ set default="${saved_entry}" |
|
+fi |
|
+ |
|
+if [ x"${feature_menuentry_id}" = xy ]; then |
|
+ menuentry_id_option="--id" |
|
+else |
|
+ menuentry_id_option="" |
|
+fi |
|
+ |
|
+export menuentry_id_option |
|
+ |
|
+if [ "${prev_saved_entry}" ]; then |
|
+ set saved_entry="${prev_saved_entry}" |
|
+ save_env saved_entry |
|
+ set prev_saved_entry= |
|
+ save_env prev_saved_entry |
|
+ set boot_once=true |
|
+fi |
|
+ |
|
+function savedefault { |
|
+ if [ -z "${boot_once}" ]; then |
|
+ saved_entry="${chosen}" |
|
+ save_env saved_entry |
|
+ fi |
|
+} |
|
+ |
|
+function load_video { |
|
+ if [ x$feature_all_video_module = xy ]; then |
|
+ insmod all_video |
|
+ else |
|
+ insmod efi_gop |
|
+ insmod efi_uga |
|
+ insmod ieee1275_fb |
|
+ insmod vbe |
|
+ insmod vga |
|
+ insmod video_bochs |
|
+ insmod video_cirrus |
|
+ fi |
|
+} |
|
+ |
|
+terminal_output console |
|
+if [ x$feature_timeout_style = xy ] ; then |
|
+ set timeout_style=menu |
|
+ set timeout=15 |
|
+# Fallback normal timeout code in case the timeout_style feature is |
|
+# unavailable. |
|
+else |
|
+ set timeout=15 |
|
+fi |
|
+### END /etc/grub.d/00_header ### |
|
+ |
|
+### BEGIN /etc/grub.d/10_linux ### |
|
+menuentry 'title' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' --hint='hd1,msdos3' 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ fi |
|
+ linux16 /root4/boot/new-kernel.img root=UUID=54c6abc2-b1e7-4987-aa73-c79927be69eb ro rootflags=subvol=root4 rhgb quiet |
|
+} |
|
+menuentry 'Fedora, with Linux 3.15.0-0.rc7.git2.1.fc21.x86_64' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' --hint='hd1,msdos3' 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ fi |
|
+ linux16 /root4/boot/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=54c6abc2-b1e7-4987-aa73-c79927be69eb ro rootflags=subvol=root4 rhgb quiet |
|
+ initrd16 /root4/boot/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img |
|
+} |
|
+menuentry 'Fedora, with Linux 0-rescue-20e7024f4e9c4b70b1042b91acd434c6' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' --hint='hd1,msdos3' 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ fi |
|
+ linux16 /root4/boot/vmlinuz-0-rescue-20e7024f4e9c4b70b1042b91acd434c6 root=UUID=54c6abc2-b1e7-4987-aa73-c79927be69eb ro rootflags=subvol=root4 rhgb quiet |
|
+ initrd16 /root4/boot/initramfs-0-rescue-20e7024f4e9c4b70b1042b91acd434c6.img |
|
+} |
|
+ |
|
+### END /etc/grub.d/10_linux ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### END /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_ppc_terminfo ### |
|
+### END /etc/grub.d/20_ppc_terminfo ### |
|
+ |
|
+### BEGIN /etc/grub.d/30_os-prober ### |
|
+### |
|
+ |
|
+### BEGIN /etc/grub.d/40_custom ### |
|
+# This file provides an easy way to add custom menu entries. Simply type the |
|
+# menu entries you want to add after this comment. Be careful not to change |
|
+# the 'exec tail' line above. |
|
+### END /etc/grub.d/40_custom ### |
|
+ |
|
+### BEGIN /etc/grub.d/41_custom ### |
|
+if [ -f ${config_directory}/custom.cfg ]; then |
|
+ source ${config_directory}/custom.cfg |
|
+elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then |
|
+ source $prefix/custom.cfg; |
|
+fi |
|
+### END /etc/grub.d/41_custom ### |
|
diff --git a/test/grub2.24 b/test/grub2.24 |
|
new file mode 100644 |
|
index 00000000000..23b75fa8d3c |
|
--- /dev/null |
|
+++ b/test/grub2.24 |
|
@@ -0,0 +1,126 @@ |
|
+# |
|
+# DO NOT EDIT THIS FILE |
|
+# |
|
+# It is automatically generated by grub2-mkconfig using templates |
|
+# from /etc/grub.d and settings from /etc/default/grub |
|
+# |
|
+ |
|
+### BEGIN /etc/grub.d/00_header ### |
|
+set pager=1 |
|
+ |
|
+if [ -s $prefix/grubenv ]; then |
|
+ load_env |
|
+fi |
|
+if [ "${next_entry}" ] ; then |
|
+ set default="${next_entry}" |
|
+ set next_entry= |
|
+ save_env next_entry |
|
+ set boot_once=true |
|
+else |
|
+ set default="${saved_entry}" |
|
+fi |
|
+ |
|
+if [ x"${feature_menuentry_id}" = xy ]; then |
|
+ menuentry_id_option="--id" |
|
+else |
|
+ menuentry_id_option="" |
|
+fi |
|
+ |
|
+export menuentry_id_option |
|
+ |
|
+if [ "${prev_saved_entry}" ]; then |
|
+ set saved_entry="${prev_saved_entry}" |
|
+ save_env saved_entry |
|
+ set prev_saved_entry= |
|
+ save_env prev_saved_entry |
|
+ set boot_once=true |
|
+fi |
|
+ |
|
+function savedefault { |
|
+ if [ -z "${boot_once}" ]; then |
|
+ saved_entry="${chosen}" |
|
+ save_env saved_entry |
|
+ fi |
|
+} |
|
+ |
|
+function load_video { |
|
+ if [ x$feature_all_video_module = xy ]; then |
|
+ insmod all_video |
|
+ else |
|
+ insmod efi_gop |
|
+ insmod efi_uga |
|
+ insmod ieee1275_fb |
|
+ insmod vbe |
|
+ insmod vga |
|
+ insmod video_bochs |
|
+ insmod video_cirrus |
|
+ fi |
|
+} |
|
+ |
|
+terminal_output console |
|
+if [ x$feature_timeout_style = xy ] ; then |
|
+ set timeout_style=menu |
|
+ set timeout=15 |
|
+# Fallback normal timeout code in case the timeout_style feature is |
|
+# unavailable. |
|
+else |
|
+ set timeout=15 |
|
+fi |
|
+### END /etc/grub.d/00_header ### |
|
+ |
|
+### BEGIN /etc/grub.d/10_linux ### |
|
+menuentry 'Fedora, with Linux 3.15.0-0.rc7.git2.1.fc21.x86_64' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ fi |
|
+ linux16 /boot6/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=1bab15a4-93ce-4373-8d7d-b77f907fd0c6 ro rootflags=subvol=root6 rhgb quiet |
|
+ initrd16 /boot6/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img |
|
+} |
|
+menuentry 'Fedora, with Linux 0-rescue-81378818f7a24478b496ebef90e1dd69' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ fi |
|
+ linux16 /boot6/vmlinuz-0-rescue-81378818f7a24478b496ebef90e1dd69 root=UUID=1bab15a4-93ce-4373-8d7d-b77f907fd0c6 ro rootflags=subvol=root6 rhgb quiet |
|
+ initrd16 /boot6/initramfs-0-rescue-81378818f7a24478b496ebef90e1dd69.img |
|
+} |
|
+ |
|
+### END /etc/grub.d/10_linux ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### END /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_ppc_terminfo ### |
|
+### END /etc/grub.d/20_ppc_terminfo ### |
|
+ |
|
+### BEGIN /etc/grub.d/30_os-prober ### |
|
+### END /etc/grub.d/30_os-prober ### |
|
+ |
|
+### BEGIN /etc/grub.d/40_custom ### |
|
+# This file provides an easy way to add custom menu entries. Simply type the |
|
+# menu entries you want to add after this comment. Be careful not to change |
|
+# the 'exec tail' line above. |
|
+### END /etc/grub.d/40_custom ### |
|
+ |
|
+### BEGIN /etc/grub.d/41_custom ### |
|
+if [ -f ${config_directory}/custom.cfg ]; then |
|
+ source ${config_directory}/custom.cfg |
|
+elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then |
|
+ source $prefix/custom.cfg; |
|
+fi |
|
+### END /etc/grub.d/41_custom ### |
|
diff --git a/test/grub2.25 b/test/grub2.25 |
|
new file mode 100644 |
|
index 00000000000..9466bc35153 |
|
--- /dev/null |
|
+++ b/test/grub2.25 |
|
@@ -0,0 +1,128 @@ |
|
+# |
|
+# DO NOT EDIT THIS FILE |
|
+# |
|
+# It is automatically generated by grub2-mkconfig using templates |
|
+# from /etc/grub.d and settings from /etc/default/grub |
|
+# |
|
+ |
|
+### BEGIN /etc/grub.d/00_header ### |
|
+set pager=1 |
|
+ |
|
+if [ -s $prefix/grubenv ]; then |
|
+ load_env |
|
+fi |
|
+if [ "${next_entry}" ] ; then |
|
+ set default="${next_entry}" |
|
+ set next_entry= |
|
+ save_env next_entry |
|
+ set boot_once=true |
|
+else |
|
+ set default="${saved_entry}" |
|
+fi |
|
+ |
|
+if [ x"${feature_menuentry_id}" = xy ]; then |
|
+ menuentry_id_option="--id" |
|
+else |
|
+ menuentry_id_option="" |
|
+fi |
|
+ |
|
+export menuentry_id_option |
|
+ |
|
+if [ "${prev_saved_entry}" ]; then |
|
+ set saved_entry="${prev_saved_entry}" |
|
+ save_env saved_entry |
|
+ set prev_saved_entry= |
|
+ save_env prev_saved_entry |
|
+ set boot_once=true |
|
+fi |
|
+ |
|
+function savedefault { |
|
+ if [ -z "${boot_once}" ]; then |
|
+ saved_entry="${chosen}" |
|
+ save_env saved_entry |
|
+ fi |
|
+} |
|
+ |
|
+function load_video { |
|
+ if [ x$feature_all_video_module = xy ]; then |
|
+ insmod all_video |
|
+ else |
|
+ insmod efi_gop |
|
+ insmod efi_uga |
|
+ insmod ieee1275_fb |
|
+ insmod vbe |
|
+ insmod vga |
|
+ insmod video_bochs |
|
+ insmod video_cirrus |
|
+ fi |
|
+} |
|
+ |
|
+terminal_output console |
|
+if [ x$feature_timeout_style = xy ] ; then |
|
+ set timeout_style=menu |
|
+ set timeout=15 |
|
+# Fallback normal timeout code in case the timeout_style feature is |
|
+# unavailable. |
|
+else |
|
+ set timeout=15 |
|
+fi |
|
+### END /etc/grub.d/00_header ### |
|
+ |
|
+### BEGIN /etc/grub.d/10_linux ### |
|
+menuentry 'Fedora, with Linux 3.15.0-0.rc7.git2.1.fc21.x86_64' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' --hint='hd1,msdos3' 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ fi |
|
+ linux16 /root4/boot/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=54c6abc2-b1e7-4987-aa73-c79927be69eb ro rootflags=subvol=root4 rhgb quiet |
|
+ initrd16 /root4/boot/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img |
|
+} |
|
+menuentry 'Fedora, with Linux 0-rescue-20e7024f4e9c4b70b1042b91acd434c6' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' --hint='hd1,msdos3' 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ fi |
|
+ linux16 /root4/boot/vmlinuz-0-rescue-20e7024f4e9c4b70b1042b91acd434c6 root=UUID=54c6abc2-b1e7-4987-aa73-c79927be69eb ro rootflags=subvol=root4 rhgb quiet |
|
+ initrd16 /root4/boot/initramfs-0-rescue-20e7024f4e9c4b70b1042b91acd434c6.img |
|
+} |
|
+ |
|
+### END /etc/grub.d/10_linux ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### END /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_ppc_terminfo ### |
|
+### END /etc/grub.d/20_ppc_terminfo ### |
|
+ |
|
+### BEGIN /etc/grub.d/30_os-prober ### |
|
+### |
|
+ |
|
+### BEGIN /etc/grub.d/40_custom ### |
|
+# This file provides an easy way to add custom menu entries. Simply type the |
|
+# menu entries you want to add after this comment. Be careful not to change |
|
+# the 'exec tail' line above. |
|
+### END /etc/grub.d/40_custom ### |
|
+ |
|
+### BEGIN /etc/grub.d/41_custom ### |
|
+if [ -f ${config_directory}/custom.cfg ]; then |
|
+ source ${config_directory}/custom.cfg |
|
+elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then |
|
+ source $prefix/custom.cfg; |
|
+fi |
|
+### END /etc/grub.d/41_custom ### |
|
diff --git a/test/results/add/g2-1.20 b/test/results/add/g2-1.20 |
|
new file mode 100644 |
|
index 00000000000..579c2f6744a |
|
--- /dev/null |
|
+++ b/test/results/add/g2-1.20 |
|
@@ -0,0 +1,140 @@ |
|
+# |
|
+# DO NOT EDIT THIS FILE |
|
+# |
|
+# It is automatically generated by grub2-mkconfig using templates |
|
+# from /etc/grub.d and settings from /etc/default/grub |
|
+# |
|
+ |
|
+### BEGIN /etc/grub.d/00_header ### |
|
+set pager=1 |
|
+ |
|
+if [ -s $prefix/grubenv ]; then |
|
+ load_env |
|
+fi |
|
+if [ "${next_entry}" ] ; then |
|
+ set default="${next_entry}" |
|
+ set next_entry= |
|
+ save_env next_entry |
|
+ set boot_once=true |
|
+else |
|
+ set default="${saved_entry}" |
|
+fi |
|
+ |
|
+if [ x"${feature_menuentry_id}" = xy ]; then |
|
+ menuentry_id_option="--id" |
|
+else |
|
+ menuentry_id_option="" |
|
+fi |
|
+ |
|
+export menuentry_id_option |
|
+ |
|
+if [ "${prev_saved_entry}" ]; then |
|
+ set saved_entry="${prev_saved_entry}" |
|
+ save_env saved_entry |
|
+ set prev_saved_entry= |
|
+ save_env prev_saved_entry |
|
+ set boot_once=true |
|
+fi |
|
+ |
|
+function savedefault { |
|
+ if [ -z "${boot_once}" ]; then |
|
+ saved_entry="${chosen}" |
|
+ save_env saved_entry |
|
+ fi |
|
+} |
|
+ |
|
+function load_video { |
|
+ if [ x$feature_all_video_module = xy ]; then |
|
+ insmod all_video |
|
+ else |
|
+ insmod efi_gop |
|
+ insmod efi_uga |
|
+ insmod ieee1275_fb |
|
+ insmod vbe |
|
+ insmod vga |
|
+ insmod video_bochs |
|
+ insmod video_cirrus |
|
+ fi |
|
+} |
|
+ |
|
+terminal_output console |
|
+if [ x$feature_timeout_style = xy ] ; then |
|
+ set timeout_style=menu |
|
+ set timeout=15 |
|
+# Fallback normal timeout code in case the timeout_style feature is |
|
+# unavailable. |
|
+else |
|
+ set timeout=15 |
|
+fi |
|
+### END /etc/grub.d/00_header ### |
|
+ |
|
+### BEGIN /etc/grub.d/10_linux ### |
|
+menuentry 'title' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ fi |
|
+ linux16 /boot6/new-kernel.img root=UUID=1bab15a4-93ce-4373-8d7d-b77f907fd0c6 ro rootflags=subvol=root6 rhgb quiet |
|
+} |
|
+menuentry 'Fedora, with Linux 3.15.0-0.rc7.git2.1.fc21.x86_64' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ fi |
|
+ linux16 /boot6/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=1bab15a4-93ce-4373-8d7d-b77f907fd0c6 ro rootflags=subvol=root6 rhgb quiet |
|
+ initrd16 /boot6/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img |
|
+} |
|
+menuentry 'Fedora, with Linux 0-rescue-81378818f7a24478b496ebef90e1dd69' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ fi |
|
+ linux16 /boot6/vmlinuz-0-rescue-81378818f7a24478b496ebef90e1dd69 root=UUID=1bab15a4-93ce-4373-8d7d-b77f907fd0c6 ro rootflags=subvol=root6 rhgb quiet |
|
+ initrd16 /boot6/initramfs-0-rescue-81378818f7a24478b496ebef90e1dd69.img |
|
+} |
|
+ |
|
+### END /etc/grub.d/10_linux ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### END /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_ppc_terminfo ### |
|
+### END /etc/grub.d/20_ppc_terminfo ### |
|
+ |
|
+### BEGIN /etc/grub.d/30_os-prober ### |
|
+### END /etc/grub.d/30_os-prober ### |
|
+ |
|
+### BEGIN /etc/grub.d/40_custom ### |
|
+# This file provides an easy way to add custom menu entries. Simply type the |
|
+# menu entries you want to add after this comment. Be careful not to change |
|
+# the 'exec tail' line above. |
|
+### END /etc/grub.d/40_custom ### |
|
+ |
|
+### BEGIN /etc/grub.d/41_custom ### |
|
+if [ -f ${config_directory}/custom.cfg ]; then |
|
+ source ${config_directory}/custom.cfg |
|
+elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then |
|
+ source $prefix/custom.cfg; |
|
+fi |
|
+### END /etc/grub.d/41_custom ### |
|
diff --git a/test/results/add/g2-1.21 b/test/results/add/g2-1.21 |
|
new file mode 100644 |
|
index 00000000000..c0dded9724c |
|
--- /dev/null |
|
+++ b/test/results/add/g2-1.21 |
|
@@ -0,0 +1,141 @@ |
|
+# |
|
+# DO NOT EDIT THIS FILE |
|
+# |
|
+# It is automatically generated by grub2-mkconfig using templates |
|
+# from /etc/grub.d and settings from /etc/default/grub |
|
+# |
|
+ |
|
+### BEGIN /etc/grub.d/00_header ### |
|
+set pager=1 |
|
+ |
|
+if [ -s $prefix/grubenv ]; then |
|
+ load_env |
|
+fi |
|
+if [ "${next_entry}" ] ; then |
|
+ set default="${next_entry}" |
|
+ set next_entry= |
|
+ save_env next_entry |
|
+ set boot_once=true |
|
+else |
|
+ set default="${saved_entry}" |
|
+fi |
|
+ |
|
+if [ x"${feature_menuentry_id}" = xy ]; then |
|
+ menuentry_id_option="--id" |
|
+else |
|
+ menuentry_id_option="" |
|
+fi |
|
+ |
|
+export menuentry_id_option |
|
+ |
|
+if [ "${prev_saved_entry}" ]; then |
|
+ set saved_entry="${prev_saved_entry}" |
|
+ save_env saved_entry |
|
+ set prev_saved_entry= |
|
+ save_env prev_saved_entry |
|
+ set boot_once=true |
|
+fi |
|
+ |
|
+function savedefault { |
|
+ if [ -z "${boot_once}" ]; then |
|
+ saved_entry="${chosen}" |
|
+ save_env saved_entry |
|
+ fi |
|
+} |
|
+ |
|
+function load_video { |
|
+ if [ x$feature_all_video_module = xy ]; then |
|
+ insmod all_video |
|
+ else |
|
+ insmod efi_gop |
|
+ insmod efi_uga |
|
+ insmod ieee1275_fb |
|
+ insmod vbe |
|
+ insmod vga |
|
+ insmod video_bochs |
|
+ insmod video_cirrus |
|
+ fi |
|
+} |
|
+ |
|
+terminal_output console |
|
+if [ x$feature_timeout_style = xy ] ; then |
|
+ set timeout_style=menu |
|
+ set timeout=15 |
|
+# Fallback normal timeout code in case the timeout_style feature is |
|
+# unavailable. |
|
+else |
|
+ set timeout=15 |
|
+fi |
|
+### END /etc/grub.d/00_header ### |
|
+ |
|
+### BEGIN /etc/grub.d/10_linux ### |
|
+menuentry 'title' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ fi |
|
+ linux16 /boot6/new-kernel.img root=UUID=1bab15a4-93ce-4373-8d7d-b77f907fd0c6 ro rootflags=subvol=root6 rhgb quiet |
|
+ initrd16 /boot6/new-initrd |
|
+} |
|
+menuentry 'Fedora, with Linux 3.15.0-0.rc7.git2.1.fc21.x86_64' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ fi |
|
+ linux16 /boot6/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=1bab15a4-93ce-4373-8d7d-b77f907fd0c6 ro rootflags=subvol=root6 rhgb quiet |
|
+ initrd16 /boot6/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img |
|
+} |
|
+menuentry 'Fedora, with Linux 0-rescue-81378818f7a24478b496ebef90e1dd69' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ fi |
|
+ linux16 /boot6/vmlinuz-0-rescue-81378818f7a24478b496ebef90e1dd69 root=UUID=1bab15a4-93ce-4373-8d7d-b77f907fd0c6 ro rootflags=subvol=root6 rhgb quiet |
|
+ initrd16 /boot6/initramfs-0-rescue-81378818f7a24478b496ebef90e1dd69.img |
|
+} |
|
+ |
|
+### END /etc/grub.d/10_linux ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### END /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_ppc_terminfo ### |
|
+### END /etc/grub.d/20_ppc_terminfo ### |
|
+ |
|
+### BEGIN /etc/grub.d/30_os-prober ### |
|
+### END /etc/grub.d/30_os-prober ### |
|
+ |
|
+### BEGIN /etc/grub.d/40_custom ### |
|
+# This file provides an easy way to add custom menu entries. Simply type the |
|
+# menu entries you want to add after this comment. Be careful not to change |
|
+# the 'exec tail' line above. |
|
+### END /etc/grub.d/40_custom ### |
|
+ |
|
+### BEGIN /etc/grub.d/41_custom ### |
|
+if [ -f ${config_directory}/custom.cfg ]; then |
|
+ source ${config_directory}/custom.cfg |
|
+elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then |
|
+ source $prefix/custom.cfg; |
|
+fi |
|
+### END /etc/grub.d/41_custom ### |
|
diff --git a/test/results/add/g2-1.22 b/test/results/add/g2-1.22 |
|
new file mode 100644 |
|
index 00000000000..5cb240fc1de |
|
--- /dev/null |
|
+++ b/test/results/add/g2-1.22 |
|
@@ -0,0 +1,143 @@ |
|
+# |
|
+# DO NOT EDIT THIS FILE |
|
+# |
|
+# It is automatically generated by grub2-mkconfig using templates |
|
+# from /etc/grub.d and settings from /etc/default/grub |
|
+# |
|
+ |
|
+### BEGIN /etc/grub.d/00_header ### |
|
+set pager=1 |
|
+ |
|
+if [ -s $prefix/grubenv ]; then |
|
+ load_env |
|
+fi |
|
+if [ "${next_entry}" ] ; then |
|
+ set default="${next_entry}" |
|
+ set next_entry= |
|
+ save_env next_entry |
|
+ set boot_once=true |
|
+else |
|
+ set default="${saved_entry}" |
|
+fi |
|
+ |
|
+if [ x"${feature_menuentry_id}" = xy ]; then |
|
+ menuentry_id_option="--id" |
|
+else |
|
+ menuentry_id_option="" |
|
+fi |
|
+ |
|
+export menuentry_id_option |
|
+ |
|
+if [ "${prev_saved_entry}" ]; then |
|
+ set saved_entry="${prev_saved_entry}" |
|
+ save_env saved_entry |
|
+ set prev_saved_entry= |
|
+ save_env prev_saved_entry |
|
+ set boot_once=true |
|
+fi |
|
+ |
|
+function savedefault { |
|
+ if [ -z "${boot_once}" ]; then |
|
+ saved_entry="${chosen}" |
|
+ save_env saved_entry |
|
+ fi |
|
+} |
|
+ |
|
+function load_video { |
|
+ if [ x$feature_all_video_module = xy ]; then |
|
+ insmod all_video |
|
+ else |
|
+ insmod efi_gop |
|
+ insmod efi_uga |
|
+ insmod ieee1275_fb |
|
+ insmod vbe |
|
+ insmod vga |
|
+ insmod video_bochs |
|
+ insmod video_cirrus |
|
+ fi |
|
+} |
|
+ |
|
+terminal_output console |
|
+if [ x$feature_timeout_style = xy ] ; then |
|
+ set timeout_style=menu |
|
+ set timeout=15 |
|
+# Fallback normal timeout code in case the timeout_style feature is |
|
+# unavailable. |
|
+else |
|
+ set timeout=15 |
|
+fi |
|
+### END /etc/grub.d/00_header ### |
|
+ |
|
+### BEGIN /etc/grub.d/10_linux ### |
|
+menuentry 'title' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' --hint='hd1,msdos3' 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ fi |
|
+ linux16 /root4/boot/new-kernel.img root=UUID=54c6abc2-b1e7-4987-aa73-c79927be69eb ro rootflags=subvol=root4 rhgb quiet |
|
+} |
|
+menuentry 'Fedora, with Linux 3.15.0-0.rc7.git2.1.fc21.x86_64' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' --hint='hd1,msdos3' 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ fi |
|
+ linux16 /root4/boot/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=54c6abc2-b1e7-4987-aa73-c79927be69eb ro rootflags=subvol=root4 rhgb quiet |
|
+ initrd16 /root4/boot/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img |
|
+} |
|
+menuentry 'Fedora, with Linux 0-rescue-20e7024f4e9c4b70b1042b91acd434c6' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' --hint='hd1,msdos3' 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ fi |
|
+ linux16 /root4/boot/vmlinuz-0-rescue-20e7024f4e9c4b70b1042b91acd434c6 root=UUID=54c6abc2-b1e7-4987-aa73-c79927be69eb ro rootflags=subvol=root4 rhgb quiet |
|
+ initrd16 /root4/boot/initramfs-0-rescue-20e7024f4e9c4b70b1042b91acd434c6.img |
|
+} |
|
+ |
|
+### END /etc/grub.d/10_linux ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### END /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_ppc_terminfo ### |
|
+### END /etc/grub.d/20_ppc_terminfo ### |
|
+ |
|
+### BEGIN /etc/grub.d/30_os-prober ### |
|
+### |
|
+ |
|
+### BEGIN /etc/grub.d/40_custom ### |
|
+# This file provides an easy way to add custom menu entries. Simply type the |
|
+# menu entries you want to add after this comment. Be careful not to change |
|
+# the 'exec tail' line above. |
|
+### END /etc/grub.d/40_custom ### |
|
+ |
|
+### BEGIN /etc/grub.d/41_custom ### |
|
+if [ -f ${config_directory}/custom.cfg ]; then |
|
+ source ${config_directory}/custom.cfg |
|
+elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then |
|
+ source $prefix/custom.cfg; |
|
+fi |
|
+### END /etc/grub.d/41_custom ### |
|
diff --git a/test/results/add/g2-1.23 b/test/results/add/g2-1.23 |
|
new file mode 100644 |
|
index 00000000000..c3e87cf7897 |
|
--- /dev/null |
|
+++ b/test/results/add/g2-1.23 |
|
@@ -0,0 +1,144 @@ |
|
+# |
|
+# DO NOT EDIT THIS FILE |
|
+# |
|
+# It is automatically generated by grub2-mkconfig using templates |
|
+# from /etc/grub.d and settings from /etc/default/grub |
|
+# |
|
+ |
|
+### BEGIN /etc/grub.d/00_header ### |
|
+set pager=1 |
|
+ |
|
+if [ -s $prefix/grubenv ]; then |
|
+ load_env |
|
+fi |
|
+if [ "${next_entry}" ] ; then |
|
+ set default="${next_entry}" |
|
+ set next_entry= |
|
+ save_env next_entry |
|
+ set boot_once=true |
|
+else |
|
+ set default="${saved_entry}" |
|
+fi |
|
+ |
|
+if [ x"${feature_menuentry_id}" = xy ]; then |
|
+ menuentry_id_option="--id" |
|
+else |
|
+ menuentry_id_option="" |
|
+fi |
|
+ |
|
+export menuentry_id_option |
|
+ |
|
+if [ "${prev_saved_entry}" ]; then |
|
+ set saved_entry="${prev_saved_entry}" |
|
+ save_env saved_entry |
|
+ set prev_saved_entry= |
|
+ save_env prev_saved_entry |
|
+ set boot_once=true |
|
+fi |
|
+ |
|
+function savedefault { |
|
+ if [ -z "${boot_once}" ]; then |
|
+ saved_entry="${chosen}" |
|
+ save_env saved_entry |
|
+ fi |
|
+} |
|
+ |
|
+function load_video { |
|
+ if [ x$feature_all_video_module = xy ]; then |
|
+ insmod all_video |
|
+ else |
|
+ insmod efi_gop |
|
+ insmod efi_uga |
|
+ insmod ieee1275_fb |
|
+ insmod vbe |
|
+ insmod vga |
|
+ insmod video_bochs |
|
+ insmod video_cirrus |
|
+ fi |
|
+} |
|
+ |
|
+terminal_output console |
|
+if [ x$feature_timeout_style = xy ] ; then |
|
+ set timeout_style=menu |
|
+ set timeout=15 |
|
+# Fallback normal timeout code in case the timeout_style feature is |
|
+# unavailable. |
|
+else |
|
+ set timeout=15 |
|
+fi |
|
+### END /etc/grub.d/00_header ### |
|
+ |
|
+### BEGIN /etc/grub.d/10_linux ### |
|
+menuentry 'title' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' --hint='hd1,msdos3' 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ fi |
|
+ linux16 /root4/boot/new-kernel.img root=UUID=54c6abc2-b1e7-4987-aa73-c79927be69eb ro rootflags=subvol=root4 rhgb quiet |
|
+ initrd16 /root4/boot/new-initrd |
|
+} |
|
+menuentry 'Fedora, with Linux 3.15.0-0.rc7.git2.1.fc21.x86_64' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' --hint='hd1,msdos3' 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ fi |
|
+ linux16 /root4/boot/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=54c6abc2-b1e7-4987-aa73-c79927be69eb ro rootflags=subvol=root4 rhgb quiet |
|
+ initrd16 /root4/boot/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img |
|
+} |
|
+menuentry 'Fedora, with Linux 0-rescue-20e7024f4e9c4b70b1042b91acd434c6' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' --hint='hd1,msdos3' 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ fi |
|
+ linux16 /root4/boot/vmlinuz-0-rescue-20e7024f4e9c4b70b1042b91acd434c6 root=UUID=54c6abc2-b1e7-4987-aa73-c79927be69eb ro rootflags=subvol=root4 rhgb quiet |
|
+ initrd16 /root4/boot/initramfs-0-rescue-20e7024f4e9c4b70b1042b91acd434c6.img |
|
+} |
|
+ |
|
+### END /etc/grub.d/10_linux ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### END /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_ppc_terminfo ### |
|
+### END /etc/grub.d/20_ppc_terminfo ### |
|
+ |
|
+### BEGIN /etc/grub.d/30_os-prober ### |
|
+### |
|
+ |
|
+### BEGIN /etc/grub.d/40_custom ### |
|
+# This file provides an easy way to add custom menu entries. Simply type the |
|
+# menu entries you want to add after this comment. Be careful not to change |
|
+# the 'exec tail' line above. |
|
+### END /etc/grub.d/40_custom ### |
|
+ |
|
+### BEGIN /etc/grub.d/41_custom ### |
|
+if [ -f ${config_directory}/custom.cfg ]; then |
|
+ source ${config_directory}/custom.cfg |
|
+elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then |
|
+ source $prefix/custom.cfg; |
|
+fi |
|
+### END /etc/grub.d/41_custom ### |
|
diff --git a/test/results/add/g2-1.24 b/test/results/add/g2-1.24 |
|
new file mode 100644 |
|
index 00000000000..c0dded9724c |
|
--- /dev/null |
|
+++ b/test/results/add/g2-1.24 |
|
@@ -0,0 +1,141 @@ |
|
+# |
|
+# DO NOT EDIT THIS FILE |
|
+# |
|
+# It is automatically generated by grub2-mkconfig using templates |
|
+# from /etc/grub.d and settings from /etc/default/grub |
|
+# |
|
+ |
|
+### BEGIN /etc/grub.d/00_header ### |
|
+set pager=1 |
|
+ |
|
+if [ -s $prefix/grubenv ]; then |
|
+ load_env |
|
+fi |
|
+if [ "${next_entry}" ] ; then |
|
+ set default="${next_entry}" |
|
+ set next_entry= |
|
+ save_env next_entry |
|
+ set boot_once=true |
|
+else |
|
+ set default="${saved_entry}" |
|
+fi |
|
+ |
|
+if [ x"${feature_menuentry_id}" = xy ]; then |
|
+ menuentry_id_option="--id" |
|
+else |
|
+ menuentry_id_option="" |
|
+fi |
|
+ |
|
+export menuentry_id_option |
|
+ |
|
+if [ "${prev_saved_entry}" ]; then |
|
+ set saved_entry="${prev_saved_entry}" |
|
+ save_env saved_entry |
|
+ set prev_saved_entry= |
|
+ save_env prev_saved_entry |
|
+ set boot_once=true |
|
+fi |
|
+ |
|
+function savedefault { |
|
+ if [ -z "${boot_once}" ]; then |
|
+ saved_entry="${chosen}" |
|
+ save_env saved_entry |
|
+ fi |
|
+} |
|
+ |
|
+function load_video { |
|
+ if [ x$feature_all_video_module = xy ]; then |
|
+ insmod all_video |
|
+ else |
|
+ insmod efi_gop |
|
+ insmod efi_uga |
|
+ insmod ieee1275_fb |
|
+ insmod vbe |
|
+ insmod vga |
|
+ insmod video_bochs |
|
+ insmod video_cirrus |
|
+ fi |
|
+} |
|
+ |
|
+terminal_output console |
|
+if [ x$feature_timeout_style = xy ] ; then |
|
+ set timeout_style=menu |
|
+ set timeout=15 |
|
+# Fallback normal timeout code in case the timeout_style feature is |
|
+# unavailable. |
|
+else |
|
+ set timeout=15 |
|
+fi |
|
+### END /etc/grub.d/00_header ### |
|
+ |
|
+### BEGIN /etc/grub.d/10_linux ### |
|
+menuentry 'title' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ fi |
|
+ linux16 /boot6/new-kernel.img root=UUID=1bab15a4-93ce-4373-8d7d-b77f907fd0c6 ro rootflags=subvol=root6 rhgb quiet |
|
+ initrd16 /boot6/new-initrd |
|
+} |
|
+menuentry 'Fedora, with Linux 3.15.0-0.rc7.git2.1.fc21.x86_64' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ fi |
|
+ linux16 /boot6/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=1bab15a4-93ce-4373-8d7d-b77f907fd0c6 ro rootflags=subvol=root6 rhgb quiet |
|
+ initrd16 /boot6/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img |
|
+} |
|
+menuentry 'Fedora, with Linux 0-rescue-81378818f7a24478b496ebef90e1dd69' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 1bab15a4-93ce-4373-8d7d-b77f907fd0c6 |
|
+ fi |
|
+ linux16 /boot6/vmlinuz-0-rescue-81378818f7a24478b496ebef90e1dd69 root=UUID=1bab15a4-93ce-4373-8d7d-b77f907fd0c6 ro rootflags=subvol=root6 rhgb quiet |
|
+ initrd16 /boot6/initramfs-0-rescue-81378818f7a24478b496ebef90e1dd69.img |
|
+} |
|
+ |
|
+### END /etc/grub.d/10_linux ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### END /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_ppc_terminfo ### |
|
+### END /etc/grub.d/20_ppc_terminfo ### |
|
+ |
|
+### BEGIN /etc/grub.d/30_os-prober ### |
|
+### END /etc/grub.d/30_os-prober ### |
|
+ |
|
+### BEGIN /etc/grub.d/40_custom ### |
|
+# This file provides an easy way to add custom menu entries. Simply type the |
|
+# menu entries you want to add after this comment. Be careful not to change |
|
+# the 'exec tail' line above. |
|
+### END /etc/grub.d/40_custom ### |
|
+ |
|
+### BEGIN /etc/grub.d/41_custom ### |
|
+if [ -f ${config_directory}/custom.cfg ]; then |
|
+ source ${config_directory}/custom.cfg |
|
+elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then |
|
+ source $prefix/custom.cfg; |
|
+fi |
|
+### END /etc/grub.d/41_custom ### |
|
diff --git a/test/results/add/g2-1.25 b/test/results/add/g2-1.25 |
|
new file mode 100644 |
|
index 00000000000..c3e87cf7897 |
|
--- /dev/null |
|
+++ b/test/results/add/g2-1.25 |
|
@@ -0,0 +1,144 @@ |
|
+# |
|
+# DO NOT EDIT THIS FILE |
|
+# |
|
+# It is automatically generated by grub2-mkconfig using templates |
|
+# from /etc/grub.d and settings from /etc/default/grub |
|
+# |
|
+ |
|
+### BEGIN /etc/grub.d/00_header ### |
|
+set pager=1 |
|
+ |
|
+if [ -s $prefix/grubenv ]; then |
|
+ load_env |
|
+fi |
|
+if [ "${next_entry}" ] ; then |
|
+ set default="${next_entry}" |
|
+ set next_entry= |
|
+ save_env next_entry |
|
+ set boot_once=true |
|
+else |
|
+ set default="${saved_entry}" |
|
+fi |
|
+ |
|
+if [ x"${feature_menuentry_id}" = xy ]; then |
|
+ menuentry_id_option="--id" |
|
+else |
|
+ menuentry_id_option="" |
|
+fi |
|
+ |
|
+export menuentry_id_option |
|
+ |
|
+if [ "${prev_saved_entry}" ]; then |
|
+ set saved_entry="${prev_saved_entry}" |
|
+ save_env saved_entry |
|
+ set prev_saved_entry= |
|
+ save_env prev_saved_entry |
|
+ set boot_once=true |
|
+fi |
|
+ |
|
+function savedefault { |
|
+ if [ -z "${boot_once}" ]; then |
|
+ saved_entry="${chosen}" |
|
+ save_env saved_entry |
|
+ fi |
|
+} |
|
+ |
|
+function load_video { |
|
+ if [ x$feature_all_video_module = xy ]; then |
|
+ insmod all_video |
|
+ else |
|
+ insmod efi_gop |
|
+ insmod efi_uga |
|
+ insmod ieee1275_fb |
|
+ insmod vbe |
|
+ insmod vga |
|
+ insmod video_bochs |
|
+ insmod video_cirrus |
|
+ fi |
|
+} |
|
+ |
|
+terminal_output console |
|
+if [ x$feature_timeout_style = xy ] ; then |
|
+ set timeout_style=menu |
|
+ set timeout=15 |
|
+# Fallback normal timeout code in case the timeout_style feature is |
|
+# unavailable. |
|
+else |
|
+ set timeout=15 |
|
+fi |
|
+### END /etc/grub.d/00_header ### |
|
+ |
|
+### BEGIN /etc/grub.d/10_linux ### |
|
+menuentry 'title' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' --hint='hd1,msdos3' 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ fi |
|
+ linux16 /root4/boot/new-kernel.img root=UUID=54c6abc2-b1e7-4987-aa73-c79927be69eb ro rootflags=subvol=root4 rhgb quiet |
|
+ initrd16 /root4/boot/new-initrd |
|
+} |
|
+menuentry 'Fedora, with Linux 3.15.0-0.rc7.git2.1.fc21.x86_64' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ set gfxpayload=keep |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' --hint='hd1,msdos3' 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ fi |
|
+ linux16 /root4/boot/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=54c6abc2-b1e7-4987-aa73-c79927be69eb ro rootflags=subvol=root4 rhgb quiet |
|
+ initrd16 /root4/boot/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img |
|
+} |
|
+menuentry 'Fedora, with Linux 0-rescue-20e7024f4e9c4b70b1042b91acd434c6' --class gnu-linux --class gnu --class os { |
|
+ load_video |
|
+ insmod gzio |
|
+ insmod part_msdos |
|
+ insmod part_msdos |
|
+ insmod btrfs |
|
+ set root='hd0,msdos1' |
|
+ if [ x$feature_platform_search_hint = xy ]; then |
|
+ search --no-floppy --fs-uuid --set=root --hint='hd0,msdos1' --hint='hd1,msdos3' 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ else |
|
+ search --no-floppy --fs-uuid --set=root 54c6abc2-b1e7-4987-aa73-c79927be69eb |
|
+ fi |
|
+ linux16 /root4/boot/vmlinuz-0-rescue-20e7024f4e9c4b70b1042b91acd434c6 root=UUID=54c6abc2-b1e7-4987-aa73-c79927be69eb ro rootflags=subvol=root4 rhgb quiet |
|
+ initrd16 /root4/boot/initramfs-0-rescue-20e7024f4e9c4b70b1042b91acd434c6.img |
|
+} |
|
+ |
|
+### END /etc/grub.d/10_linux ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### END /etc/grub.d/20_linux_xen ### |
|
+ |
|
+### BEGIN /etc/grub.d/20_ppc_terminfo ### |
|
+### END /etc/grub.d/20_ppc_terminfo ### |
|
+ |
|
+### BEGIN /etc/grub.d/30_os-prober ### |
|
+### |
|
+ |
|
+### BEGIN /etc/grub.d/40_custom ### |
|
+# This file provides an easy way to add custom menu entries. Simply type the |
|
+# menu entries you want to add after this comment. Be careful not to change |
|
+# the 'exec tail' line above. |
|
+### END /etc/grub.d/40_custom ### |
|
+ |
|
+### BEGIN /etc/grub.d/41_custom ### |
|
+if [ -f ${config_directory}/custom.cfg ]; then |
|
+ source ${config_directory}/custom.cfg |
|
+elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then |
|
+ source $prefix/custom.cfg; |
|
+fi |
|
+### END /etc/grub.d/41_custom ### |
|
-- |
|
2.17.1 |
|
|
|
|