[PATCH 8/9] files for LVMlv regressions tests

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



---
 test/grub2.21            | 128 +++++++++++++++++++++++++++++++++++++++++
 test/grub2.22            | 143 ++++++++++++++++++++++++++++++++++++++++++++++
 test/grub2.23            | 128 +++++++++++++++++++++++++++++++++++++++++
 test/grub2.24            | 143 ++++++++++++++++++++++++++++++++++++++++++++++
 test/grub2.25            | 128 +++++++++++++++++++++++++++++++++++++++++
 test/grub2.26            | 128 +++++++++++++++++++++++++++++++++++++++++
 test/results/add/g2-1.21 | 143 ++++++++++++++++++++++++++++++++++++++++++++++
 test/results/add/g2-1.22 | 144 +++++++++++++++++++++++++++++++++++++++++++++++
 test/results/add/g2-1.23 | 143 ++++++++++++++++++++++++++++++++++++++++++++++
 test/results/add/g2-1.24 | 144 +++++++++++++++++++++++++++++++++++++++++++++++
 test/results/add/g2-1.25 | 144 +++++++++++++++++++++++++++++++++++++++++++++++
 test/results/add/g2-1.26 | 144 +++++++++++++++++++++++++++++++++++++++++++++++
 12 files changed, 1660 insertions(+)
 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/grub2.26
 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
 create mode 100644 test/results/add/g2-1.26

diff --git a/test/grub2.21 b/test/grub2.21
new file mode 100644
index 0000000..befc72b
--- /dev/null
+++ b/test/grub2.21
@@ -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 lvm
+	insmod ext2
+	set root='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'  7f51bdcd-d509-4416-9591-934f29a0486e
+	else
+	  search --no-floppy --fs-uuid --set=root 7f51bdcd-d509-4416-9591-934f29a0486e
+	fi
+	linux16 /vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=c63d50b3-c84a-493e-b3df-f3970258beff ro  rd.lvm.lv=lvm1a/boot1 rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+	initrd16 /initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img
+}
+menuentry 'Fedora, with Linux 0-rescue-2f4efce3149d46a68d3d8509c94f66b8' --class gnu-linux --class gnu --class os {
+	load_video
+	insmod gzio
+	insmod part_msdos
+	insmod lvm
+	insmod ext2
+	set root='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'  7f51bdcd-d509-4416-9591-934f29a0486e
+	else
+	  search --no-floppy --fs-uuid --set=root 7f51bdcd-d509-4416-9591-934f29a0486e
+	fi
+	linux16 /vmlinuz-0-rescue-2f4efce3149d46a68d3d8509c94f66b8 root=UUID=c63d50b3-c84a-493e-b3df-f3970258beff ro  rd.lvm.lv=lvm1a/boot1 rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet
+	initrd16 /initramfs-0-rescue-2f4efce3149d46a68d3d8509c94f66b8.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 0000000..d70b56e
--- /dev/null
+++ b/test/grub2.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 lvm
+	insmod ext2
+	set root='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'  7f51bdcd-d509-4416-9591-934f29a0486e
+	else
+	  search --no-floppy --fs-uuid --set=root 7f51bdcd-d509-4416-9591-934f29a0486e
+	fi
+	linux16 /new-kernel.img root=UUID=c63d50b3-c84a-493e-b3df-f3970258beff ro  rd.lvm.lv=lvm1a/boot1 rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+}
+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 lvm
+	insmod ext2
+	set root='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'  7f51bdcd-d509-4416-9591-934f29a0486e
+	else
+	  search --no-floppy --fs-uuid --set=root 7f51bdcd-d509-4416-9591-934f29a0486e
+	fi
+	linux16 /vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=c63d50b3-c84a-493e-b3df-f3970258beff ro  rd.lvm.lv=lvm1a/boot1 rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+	initrd16 /initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img
+}
+menuentry 'Fedora, with Linux 0-rescue-2f4efce3149d46a68d3d8509c94f66b8' --class gnu-linux --class gnu --class os {
+	load_video
+	insmod gzio
+	insmod part_msdos
+	insmod lvm
+	insmod ext2
+	set root='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'  7f51bdcd-d509-4416-9591-934f29a0486e
+	else
+	  search --no-floppy --fs-uuid --set=root 7f51bdcd-d509-4416-9591-934f29a0486e
+	fi
+	linux16 /vmlinuz-0-rescue-2f4efce3149d46a68d3d8509c94f66b8 root=UUID=c63d50b3-c84a-493e-b3df-f3970258beff ro  rd.lvm.lv=lvm1a/boot1 rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet
+	initrd16 /initramfs-0-rescue-2f4efce3149d46a68d3d8509c94f66b8.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.23 b/test/grub2.23
new file mode 100644
index 0000000..6837616
--- /dev/null
+++ b/test/grub2.23
@@ -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 lvm
+	insmod ext2
+	set root='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'  28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	else
+	  search --no-floppy --fs-uuid --set=root 28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	fi
+	linux16 /boot/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=28ffbdd8-917b-4d55-93cc-8679dec6d6f1 ro  rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+	initrd16 /boot/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img
+}
+menuentry 'Fedora, with Linux 0-rescue-d67dbddcff294570b5eafbf3e88a2016' --class gnu-linux --class gnu --class os {
+	load_video
+	insmod gzio
+	insmod part_msdos
+	insmod lvm
+	insmod ext2
+	set root='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'  28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	else
+	  search --no-floppy --fs-uuid --set=root 28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	fi
+	linux16 /boot/vmlinuz-0-rescue-d67dbddcff294570b5eafbf3e88a2016 root=UUID=28ffbdd8-917b-4d55-93cc-8679dec6d6f1 ro  rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet
+	initrd16 /boot/initramfs-0-rescue-d67dbddcff294570b5eafbf3e88a2016.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.24 b/test/grub2.24
new file mode 100644
index 0000000..dc27a02
--- /dev/null
+++ b/test/grub2.24
@@ -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 lvm
+	insmod ext2
+	set root='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'  28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	else
+	  search --no-floppy --fs-uuid --set=root 28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	fi
+	linux16 /boot/new-kernel.img root=UUID=28ffbdd8-917b-4d55-93cc-8679dec6d6f1 ro  rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+}
+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 lvm
+	insmod ext2
+	set root='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'  28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	else
+	  search --no-floppy --fs-uuid --set=root 28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	fi
+	linux16 /boot/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=28ffbdd8-917b-4d55-93cc-8679dec6d6f1 ro  rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+	initrd16 /boot/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img
+}
+menuentry 'Fedora, with Linux 0-rescue-d67dbddcff294570b5eafbf3e88a2016' --class gnu-linux --class gnu --class os {
+	load_video
+	insmod gzio
+	insmod part_msdos
+	insmod lvm
+	insmod ext2
+	set root='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'  28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	else
+	  search --no-floppy --fs-uuid --set=root 28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	fi
+	linux16 /boot/vmlinuz-0-rescue-d67dbddcff294570b5eafbf3e88a2016 root=UUID=28ffbdd8-917b-4d55-93cc-8679dec6d6f1 ro  rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet
+	initrd16 /boot/initramfs-0-rescue-d67dbddcff294570b5eafbf3e88a2016.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 0000000..befc72b
--- /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 lvm
+	insmod ext2
+	set root='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'  7f51bdcd-d509-4416-9591-934f29a0486e
+	else
+	  search --no-floppy --fs-uuid --set=root 7f51bdcd-d509-4416-9591-934f29a0486e
+	fi
+	linux16 /vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=c63d50b3-c84a-493e-b3df-f3970258beff ro  rd.lvm.lv=lvm1a/boot1 rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+	initrd16 /initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img
+}
+menuentry 'Fedora, with Linux 0-rescue-2f4efce3149d46a68d3d8509c94f66b8' --class gnu-linux --class gnu --class os {
+	load_video
+	insmod gzio
+	insmod part_msdos
+	insmod lvm
+	insmod ext2
+	set root='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'  7f51bdcd-d509-4416-9591-934f29a0486e
+	else
+	  search --no-floppy --fs-uuid --set=root 7f51bdcd-d509-4416-9591-934f29a0486e
+	fi
+	linux16 /vmlinuz-0-rescue-2f4efce3149d46a68d3d8509c94f66b8 root=UUID=c63d50b3-c84a-493e-b3df-f3970258beff ro  rd.lvm.lv=lvm1a/boot1 rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet
+	initrd16 /initramfs-0-rescue-2f4efce3149d46a68d3d8509c94f66b8.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.26 b/test/grub2.26
new file mode 100644
index 0000000..6837616
--- /dev/null
+++ b/test/grub2.26
@@ -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 lvm
+	insmod ext2
+	set root='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'  28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	else
+	  search --no-floppy --fs-uuid --set=root 28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	fi
+	linux16 /boot/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=28ffbdd8-917b-4d55-93cc-8679dec6d6f1 ro  rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+	initrd16 /boot/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img
+}
+menuentry 'Fedora, with Linux 0-rescue-d67dbddcff294570b5eafbf3e88a2016' --class gnu-linux --class gnu --class os {
+	load_video
+	insmod gzio
+	insmod part_msdos
+	insmod lvm
+	insmod ext2
+	set root='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'  28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	else
+	  search --no-floppy --fs-uuid --set=root 28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	fi
+	linux16 /boot/vmlinuz-0-rescue-d67dbddcff294570b5eafbf3e88a2016 root=UUID=28ffbdd8-917b-4d55-93cc-8679dec6d6f1 ro  rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet
+	initrd16 /boot/initramfs-0-rescue-d67dbddcff294570b5eafbf3e88a2016.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 0000000..d70b56e
--- /dev/null
+++ b/test/results/add/g2-1.21
@@ -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 lvm
+	insmod ext2
+	set root='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'  7f51bdcd-d509-4416-9591-934f29a0486e
+	else
+	  search --no-floppy --fs-uuid --set=root 7f51bdcd-d509-4416-9591-934f29a0486e
+	fi
+	linux16 /new-kernel.img root=UUID=c63d50b3-c84a-493e-b3df-f3970258beff ro  rd.lvm.lv=lvm1a/boot1 rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+}
+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 lvm
+	insmod ext2
+	set root='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'  7f51bdcd-d509-4416-9591-934f29a0486e
+	else
+	  search --no-floppy --fs-uuid --set=root 7f51bdcd-d509-4416-9591-934f29a0486e
+	fi
+	linux16 /vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=c63d50b3-c84a-493e-b3df-f3970258beff ro  rd.lvm.lv=lvm1a/boot1 rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+	initrd16 /initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img
+}
+menuentry 'Fedora, with Linux 0-rescue-2f4efce3149d46a68d3d8509c94f66b8' --class gnu-linux --class gnu --class os {
+	load_video
+	insmod gzio
+	insmod part_msdos
+	insmod lvm
+	insmod ext2
+	set root='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'  7f51bdcd-d509-4416-9591-934f29a0486e
+	else
+	  search --no-floppy --fs-uuid --set=root 7f51bdcd-d509-4416-9591-934f29a0486e
+	fi
+	linux16 /vmlinuz-0-rescue-2f4efce3149d46a68d3d8509c94f66b8 root=UUID=c63d50b3-c84a-493e-b3df-f3970258beff ro  rd.lvm.lv=lvm1a/boot1 rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet
+	initrd16 /initramfs-0-rescue-2f4efce3149d46a68d3d8509c94f66b8.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 0000000..3dcc357
--- /dev/null
+++ b/test/results/add/g2-1.22
@@ -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 lvm
+	insmod ext2
+	set root='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'  7f51bdcd-d509-4416-9591-934f29a0486e
+	else
+	  search --no-floppy --fs-uuid --set=root 7f51bdcd-d509-4416-9591-934f29a0486e
+	fi
+	linux16 /new-kernel.img root=UUID=c63d50b3-c84a-493e-b3df-f3970258beff ro  rd.lvm.lv=lvm1a/boot1 rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+	initrd16 /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 lvm
+	insmod ext2
+	set root='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'  7f51bdcd-d509-4416-9591-934f29a0486e
+	else
+	  search --no-floppy --fs-uuid --set=root 7f51bdcd-d509-4416-9591-934f29a0486e
+	fi
+	linux16 /vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=c63d50b3-c84a-493e-b3df-f3970258beff ro  rd.lvm.lv=lvm1a/boot1 rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+	initrd16 /initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img
+}
+menuentry 'Fedora, with Linux 0-rescue-2f4efce3149d46a68d3d8509c94f66b8' --class gnu-linux --class gnu --class os {
+	load_video
+	insmod gzio
+	insmod part_msdos
+	insmod lvm
+	insmod ext2
+	set root='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'  7f51bdcd-d509-4416-9591-934f29a0486e
+	else
+	  search --no-floppy --fs-uuid --set=root 7f51bdcd-d509-4416-9591-934f29a0486e
+	fi
+	linux16 /vmlinuz-0-rescue-2f4efce3149d46a68d3d8509c94f66b8 root=UUID=c63d50b3-c84a-493e-b3df-f3970258beff ro  rd.lvm.lv=lvm1a/boot1 rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet
+	initrd16 /initramfs-0-rescue-2f4efce3149d46a68d3d8509c94f66b8.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.23 b/test/results/add/g2-1.23
new file mode 100644
index 0000000..dc27a02
--- /dev/null
+++ b/test/results/add/g2-1.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 lvm
+	insmod ext2
+	set root='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'  28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	else
+	  search --no-floppy --fs-uuid --set=root 28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	fi
+	linux16 /boot/new-kernel.img root=UUID=28ffbdd8-917b-4d55-93cc-8679dec6d6f1 ro  rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+}
+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 lvm
+	insmod ext2
+	set root='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'  28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	else
+	  search --no-floppy --fs-uuid --set=root 28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	fi
+	linux16 /boot/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=28ffbdd8-917b-4d55-93cc-8679dec6d6f1 ro  rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+	initrd16 /boot/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img
+}
+menuentry 'Fedora, with Linux 0-rescue-d67dbddcff294570b5eafbf3e88a2016' --class gnu-linux --class gnu --class os {
+	load_video
+	insmod gzio
+	insmod part_msdos
+	insmod lvm
+	insmod ext2
+	set root='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'  28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	else
+	  search --no-floppy --fs-uuid --set=root 28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	fi
+	linux16 /boot/vmlinuz-0-rescue-d67dbddcff294570b5eafbf3e88a2016 root=UUID=28ffbdd8-917b-4d55-93cc-8679dec6d6f1 ro  rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet
+	initrd16 /boot/initramfs-0-rescue-d67dbddcff294570b5eafbf3e88a2016.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.24 b/test/results/add/g2-1.24
new file mode 100644
index 0000000..a2d913c
--- /dev/null
+++ b/test/results/add/g2-1.24
@@ -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 lvm
+	insmod ext2
+	set root='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'  28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	else
+	  search --no-floppy --fs-uuid --set=root 28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	fi
+	linux16 /boot/new-kernel.img root=UUID=28ffbdd8-917b-4d55-93cc-8679dec6d6f1 ro  rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+	initrd16 /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 lvm
+	insmod ext2
+	set root='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'  28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	else
+	  search --no-floppy --fs-uuid --set=root 28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	fi
+	linux16 /boot/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=28ffbdd8-917b-4d55-93cc-8679dec6d6f1 ro  rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+	initrd16 /boot/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img
+}
+menuentry 'Fedora, with Linux 0-rescue-d67dbddcff294570b5eafbf3e88a2016' --class gnu-linux --class gnu --class os {
+	load_video
+	insmod gzio
+	insmod part_msdos
+	insmod lvm
+	insmod ext2
+	set root='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'  28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	else
+	  search --no-floppy --fs-uuid --set=root 28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	fi
+	linux16 /boot/vmlinuz-0-rescue-d67dbddcff294570b5eafbf3e88a2016 root=UUID=28ffbdd8-917b-4d55-93cc-8679dec6d6f1 ro  rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet
+	initrd16 /boot/initramfs-0-rescue-d67dbddcff294570b5eafbf3e88a2016.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 0000000..3dcc357
--- /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 lvm
+	insmod ext2
+	set root='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'  7f51bdcd-d509-4416-9591-934f29a0486e
+	else
+	  search --no-floppy --fs-uuid --set=root 7f51bdcd-d509-4416-9591-934f29a0486e
+	fi
+	linux16 /new-kernel.img root=UUID=c63d50b3-c84a-493e-b3df-f3970258beff ro  rd.lvm.lv=lvm1a/boot1 rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+	initrd16 /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 lvm
+	insmod ext2
+	set root='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'  7f51bdcd-d509-4416-9591-934f29a0486e
+	else
+	  search --no-floppy --fs-uuid --set=root 7f51bdcd-d509-4416-9591-934f29a0486e
+	fi
+	linux16 /vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=c63d50b3-c84a-493e-b3df-f3970258beff ro  rd.lvm.lv=lvm1a/boot1 rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+	initrd16 /initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img
+}
+menuentry 'Fedora, with Linux 0-rescue-2f4efce3149d46a68d3d8509c94f66b8' --class gnu-linux --class gnu --class os {
+	load_video
+	insmod gzio
+	insmod part_msdos
+	insmod lvm
+	insmod ext2
+	set root='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/goTm1A-IC4q-9lSU-NpW7-cl7v-Gmdu-00E0om/jC9IxZ-qehG-5NGd-M2Bs-YMN7-3Z1i-pOM35w'  7f51bdcd-d509-4416-9591-934f29a0486e
+	else
+	  search --no-floppy --fs-uuid --set=root 7f51bdcd-d509-4416-9591-934f29a0486e
+	fi
+	linux16 /vmlinuz-0-rescue-2f4efce3149d46a68d3d8509c94f66b8 root=UUID=c63d50b3-c84a-493e-b3df-f3970258beff ro  rd.lvm.lv=lvm1a/boot1 rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet
+	initrd16 /initramfs-0-rescue-2f4efce3149d46a68d3d8509c94f66b8.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.26 b/test/results/add/g2-1.26
new file mode 100644
index 0000000..a2d913c
--- /dev/null
+++ b/test/results/add/g2-1.26
@@ -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 lvm
+	insmod ext2
+	set root='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'  28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	else
+	  search --no-floppy --fs-uuid --set=root 28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	fi
+	linux16 /boot/new-kernel.img root=UUID=28ffbdd8-917b-4d55-93cc-8679dec6d6f1 ro  rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+	initrd16 /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 lvm
+	insmod ext2
+	set root='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'  28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	else
+	  search --no-floppy --fs-uuid --set=root 28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	fi
+	linux16 /boot/vmlinuz-3.15.0-0.rc7.git2.1.fc21.x86_64 root=UUID=28ffbdd8-917b-4d55-93cc-8679dec6d6f1 ro  rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet LANG=en_US.UTF-8
+	initrd16 /boot/initramfs-3.15.0-0.rc7.git2.1.fc21.x86_64.img
+}
+menuentry 'Fedora, with Linux 0-rescue-d67dbddcff294570b5eafbf3e88a2016' --class gnu-linux --class gnu --class os {
+	load_video
+	insmod gzio
+	insmod part_msdos
+	insmod lvm
+	insmod ext2
+	set root='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/hSZ2kJ-qeBw-vsNO-eHS4-mIVg-ZQ8u-GLdIey/W1Ra9J-v0Nc-QlJl-9du4-2Itx-xxme-wneBeM'  28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	else
+	  search --no-floppy --fs-uuid --set=root 28ffbdd8-917b-4d55-93cc-8679dec6d6f1
+	fi
+	linux16 /boot/vmlinuz-0-rescue-d67dbddcff294570b5eafbf3e88a2016 root=UUID=28ffbdd8-917b-4d55-93cc-8679dec6d6f1 ro  rd.lvm.lv=lvm1a/swap rd.lvm.lv=lvm1a/root psmouse.proto=imps rhgb quiet
+	initrd16 /boot/initramfs-0-rescue-d67dbddcff294570b5eafbf3e88a2016.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 ###
-- 
1.9.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list




[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux