|
 |
903092 |
From ef74333dffe359aa5cf9ea1313ab9ccb7ed3b192 Mon Sep 17 00:00:00 2001
|
|
|
903092 |
From: Robert Marshall <rmarshall@redhat.com>
|
|
|
903092 |
Date: Thu, 22 Dec 2016 17:40:52 -0500
|
|
|
903092 |
Subject: [PATCH 67/69] Add multi-entry removal test (#1285601)
|
|
|
903092 |
|
|
|
903092 |
Test what happens to the default entry set in the grub environment after
|
|
|
903092 |
removing the first two boot entries.
|
|
|
903092 |
|
|
|
903092 |
Related: rhbz#1285601
|
|
|
903092 |
---
|
|
|
903092 |
test.sh | 7 +++
|
|
|
903092 |
test/grub2-support_files/grubenv.4 | 3 +
|
|
|
903092 |
test/grub2.19 | 112 +++++++++++++++++++++++++++++++++++++
|
|
|
903092 |
test/results/remove/g2.19 | 88 +++++++++++++++++++++++++++++
|
|
|
903092 |
4 files changed, 210 insertions(+)
|
|
|
903092 |
create mode 100644 test/grub2-support_files/grubenv.4
|
|
|
903092 |
create mode 100644 test/grub2.19
|
|
|
903092 |
create mode 100644 test/results/remove/g2.19
|
|
|
903092 |
|
|
|
903092 |
diff --git a/test.sh b/test.sh
|
|
|
903092 |
index dbf7507..3631ed0 100755
|
|
|
903092 |
--- a/test.sh
|
|
|
903092 |
+++ b/test.sh
|
|
|
903092 |
@@ -570,6 +570,13 @@ if [ "$testgrub2" == "y" ]; then
|
|
|
903092 |
--copy-default --title 'Red Hat Enterprise Linux Server' \
|
|
|
903092 |
--args=root=/dev/mapper/foo--
|
|
|
903092 |
|
|
|
903092 |
+ grub2Test grub2.19 remove/g2.19 --env grubenv.4 \
|
|
|
903092 |
+ --remove-kernel=/boot/vmlinuz-2.6.38.2-9.fc15.x86_64 \
|
|
|
903092 |
+ --boot-filesystem=/boot/
|
|
|
903092 |
+ commandTest "saved_default output" \
|
|
|
903092 |
+ "grub2-editenv test/grub2-support_files/env_temp list" \
|
|
|
903092 |
+ "saved_entry=Linux, with Fedora 2.6.38.8-32.fc15.x86_64"
|
|
|
903092 |
+
|
|
|
903092 |
# copy a stanza and add arguments as well, while using --set-index=
|
|
|
903092 |
testing="GRUB2 add stanza and new args with --set-index="
|
|
|
903092 |
grub2Test grub2.18 add/g2-1.18 --env grubenv.3 \
|
|
|
903092 |
diff --git a/test/grub2-support_files/grubenv.4 b/test/grub2-support_files/grubenv.4
|
|
|
903092 |
new file mode 100644
|
|
|
903092 |
index 0000000..1311638
|
|
|
903092 |
--- /dev/null
|
|
|
903092 |
+++ b/test/grub2-support_files/grubenv.4
|
|
|
903092 |
@@ -0,0 +1,3 @@
|
|
|
903092 |
+# GRUB Environment Block
|
|
|
903092 |
+saved_entry=Linux, with Fedora 2.6.38.8-32.fc15.x86_64
|
|
|
903092 |
+################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################
|
|
|
903092 |
diff --git a/test/grub2.19 b/test/grub2.19
|
|
|
903092 |
new file mode 100644
|
|
|
903092 |
index 0000000..be07b3e
|
|
|
903092 |
--- /dev/null
|
|
|
903092 |
+++ b/test/grub2.19
|
|
|
903092 |
@@ -0,0 +1,112 @@
|
|
|
903092 |
+#
|
|
|
903092 |
+# DO NOT EDIT THIS FILE
|
|
|
903092 |
+#
|
|
|
903092 |
+# It is automatically generated by grub2-mkconfig using templates
|
|
|
903092 |
+# from /etc/grub.d and settings from /etc/default/grub
|
|
|
903092 |
+#
|
|
|
903092 |
+
|
|
|
903092 |
+### BEGIN /etc/grub.d/00_header ###
|
|
|
903092 |
+if [ -s $prefix/grubenv ]; then
|
|
|
903092 |
+ load_env
|
|
|
903092 |
+fi
|
|
|
903092 |
+if [ "${next_entry}" ] ; then
|
|
|
903092 |
+ set default="${next_entry}"
|
|
|
903092 |
+ set next_entry=
|
|
|
903092 |
+ save_env next_entry
|
|
|
903092 |
+ set boot_once=true
|
|
|
903092 |
+else
|
|
|
903092 |
+ set default="${saved_entry}"
|
|
|
903092 |
+fi
|
|
|
903092 |
+
|
|
|
903092 |
+if [ x"${feature_menuentry_id}" = xy ]; then
|
|
|
903092 |
+ menuentry_id_option="--id"
|
|
|
903092 |
+else
|
|
|
903092 |
+ menuentry_id_option=""
|
|
|
903092 |
+fi
|
|
|
903092 |
+
|
|
|
903092 |
+export menuentry_id_option
|
|
|
903092 |
+
|
|
|
903092 |
+if [ "${prev_saved_entry}" ]; then
|
|
|
903092 |
+ set saved_entry="${prev_saved_entry}"
|
|
|
903092 |
+ save_env saved_entry
|
|
|
903092 |
+ set prev_saved_entry=
|
|
|
903092 |
+ save_env prev_saved_entry
|
|
|
903092 |
+ set boot_once=true
|
|
|
903092 |
+fi
|
|
|
903092 |
+
|
|
|
903092 |
+function savedefault {
|
|
|
903092 |
+ if [ -z "${boot_once}" ]; then
|
|
|
903092 |
+ saved_entry="${chosen}"
|
|
|
903092 |
+ save_env saved_entry
|
|
|
903092 |
+ fi
|
|
|
903092 |
+}
|
|
|
903092 |
+
|
|
|
903092 |
+function load_video {
|
|
|
903092 |
+ insmod vbe
|
|
|
903092 |
+ insmod vga
|
|
|
903092 |
+ insmod video_bochs
|
|
|
903092 |
+ insmod video_cirrus
|
|
|
903092 |
+}
|
|
|
903092 |
+
|
|
|
903092 |
+set timeout=5
|
|
|
903092 |
+### END /etc/grub.d/00_header ###
|
|
|
903092 |
+
|
|
|
903092 |
+### BEGIN /etc/grub.d/10_linux ###
|
|
|
903092 |
+menuentry 'First Title To Remove' --class gnu-linux --class gnu --class os {
|
|
|
903092 |
+ load_video
|
|
|
903092 |
+ set gfxpayload=keep
|
|
|
903092 |
+ insmod part_msdos
|
|
|
903092 |
+ insmod ext2
|
|
|
903092 |
+ set root='(hd0,msdos1)'
|
|
|
903092 |
+ search --no-floppy --fs-uuid --set=root df0170c9-7d05-415c-bbd1-d4d503ba0eed
|
|
|
903092 |
+ echo 'Loading Linux 2.6.38.2-9.fc15.x86_64 ...'
|
|
|
903092 |
+ linux /vmlinuz-2.6.38.2-9.fc15.x86_64 root=/dev/mapper/vg_pjones5-lv_root ro quiet rhgb
|
|
|
903092 |
+ echo 'Loading initial ramdisk ...'
|
|
|
903092 |
+ initrd /initramfs-2.6.38.2-9.fc15.x86_64.img
|
|
|
903092 |
+}
|
|
|
903092 |
+menuentry 'Second Title To Remove' --class gnu-linux --class gnu --class os {
|
|
|
903092 |
+ load_video
|
|
|
903092 |
+ set gfxpayload=keep
|
|
|
903092 |
+ insmod part_msdos
|
|
|
903092 |
+ insmod ext2
|
|
|
903092 |
+ set root='(hd0,msdos1)'
|
|
|
903092 |
+ search --no-floppy --fs-uuid --set=root df0170c9-7d05-415c-bbd1-d4d503ba0eed
|
|
|
903092 |
+ echo 'Loading Linux 2.6.38.2-9.fc15.x86_64 ...'
|
|
|
903092 |
+ linux /vmlinuz-2.6.38.2-9.fc15.x86_64 root=/dev/mapper/vg_pjones5-lv_root ro quiet rhgb
|
|
|
903092 |
+ echo 'Loading initial ramdisk ...'
|
|
|
903092 |
+ initrd /initramfs-2.6.38.2-9.fc15.x86_64.img
|
|
|
903092 |
+}
|
|
|
903092 |
+menuentry 'Linux, with Fedora 2.6.38.8-32.fc15.x86_64' --class gnu-linux --class gnu --class os {
|
|
|
903092 |
+ load_video
|
|
|
903092 |
+ set gfxpayload=keep
|
|
|
903092 |
+ insmod part_msdos
|
|
|
903092 |
+ insmod ext2
|
|
|
903092 |
+ set root='(hd0,msdos1)'
|
|
|
903092 |
+ search --no-floppy --fs-uuid --set=root df0170c9-7d05-415c-bbd1-d4d503ba0eed
|
|
|
903092 |
+ echo 'Loading Fedora 2.6.38.8-32.fc15.x86_64 ...'
|
|
|
903092 |
+ linux /vmlinuz-2.6.38.8-32.fc15.x86_64 root=/dev/mapper/vg_pjones5-lv_root ro quiet rhgb
|
|
|
903092 |
+ echo 'Loading initial ramdisk ...'
|
|
|
903092 |
+ initrd /initramfs-2.6.38.8-32.fc15.x86_64.img
|
|
|
903092 |
+}
|
|
|
903092 |
+### END /etc/grub.d/10_linux ###
|
|
|
903092 |
+
|
|
|
903092 |
+### BEGIN /etc/grub.d/20_linux_xen ###
|
|
|
903092 |
+### END /etc/grub.d/20_linux_xen ###
|
|
|
903092 |
+
|
|
|
903092 |
+### BEGIN /etc/grub.d/30_os-prober ###
|
|
|
903092 |
+### END /etc/grub.d/30_os-prober ###
|
|
|
903092 |
+
|
|
|
903092 |
+### BEGIN /etc/grub.d/40_custom ###
|
|
|
903092 |
+# This file provides an easy way to add custom menu entries. Simply type the
|
|
|
903092 |
+# menu entries you want to add after this comment. Be careful not to change
|
|
|
903092 |
+# the 'exec tail' line above.
|
|
|
903092 |
+### END /etc/grub.d/40_custom ###
|
|
|
903092 |
+
|
|
|
903092 |
+### BEGIN /etc/grub.d/41_custom ###
|
|
|
903092 |
+if [ -f $prefix/custom.cfg ]; then
|
|
|
903092 |
+ source $prefix/custom.cfg;
|
|
|
903092 |
+fi
|
|
|
903092 |
+### END /etc/grub.d/41_custom ###
|
|
|
903092 |
+
|
|
|
903092 |
+### BEGIN /etc/grub.d/90_persistent ###
|
|
|
903092 |
+### END /etc/grub.d/90_persistent ###
|
|
|
903092 |
diff --git a/test/results/remove/g2.19 b/test/results/remove/g2.19
|
|
|
903092 |
new file mode 100644
|
|
|
903092 |
index 0000000..f65edd5
|
|
|
903092 |
--- /dev/null
|
|
|
903092 |
+++ b/test/results/remove/g2.19
|
|
|
903092 |
@@ -0,0 +1,88 @@
|
|
|
903092 |
+#
|
|
|
903092 |
+# DO NOT EDIT THIS FILE
|
|
|
903092 |
+#
|
|
|
903092 |
+# It is automatically generated by grub2-mkconfig using templates
|
|
|
903092 |
+# from /etc/grub.d and settings from /etc/default/grub
|
|
|
903092 |
+#
|
|
|
903092 |
+
|
|
|
903092 |
+### BEGIN /etc/grub.d/00_header ###
|
|
|
903092 |
+if [ -s $prefix/grubenv ]; then
|
|
|
903092 |
+ load_env
|
|
|
903092 |
+fi
|
|
|
903092 |
+if [ "${next_entry}" ] ; then
|
|
|
903092 |
+ set default="${next_entry}"
|
|
|
903092 |
+ set next_entry=
|
|
|
903092 |
+ save_env next_entry
|
|
|
903092 |
+ set boot_once=true
|
|
|
903092 |
+else
|
|
|
903092 |
+ set default="${saved_entry}"
|
|
|
903092 |
+fi
|
|
|
903092 |
+
|
|
|
903092 |
+if [ x"${feature_menuentry_id}" = xy ]; then
|
|
|
903092 |
+ menuentry_id_option="--id"
|
|
|
903092 |
+else
|
|
|
903092 |
+ menuentry_id_option=""
|
|
|
903092 |
+fi
|
|
|
903092 |
+
|
|
|
903092 |
+export menuentry_id_option
|
|
|
903092 |
+
|
|
|
903092 |
+if [ "${prev_saved_entry}" ]; then
|
|
|
903092 |
+ set saved_entry="${prev_saved_entry}"
|
|
|
903092 |
+ save_env saved_entry
|
|
|
903092 |
+ set prev_saved_entry=
|
|
|
903092 |
+ save_env prev_saved_entry
|
|
|
903092 |
+ set boot_once=true
|
|
|
903092 |
+fi
|
|
|
903092 |
+
|
|
|
903092 |
+function savedefault {
|
|
|
903092 |
+ if [ -z "${boot_once}" ]; then
|
|
|
903092 |
+ saved_entry="${chosen}"
|
|
|
903092 |
+ save_env saved_entry
|
|
|
903092 |
+ fi
|
|
|
903092 |
+}
|
|
|
903092 |
+
|
|
|
903092 |
+function load_video {
|
|
|
903092 |
+ insmod vbe
|
|
|
903092 |
+ insmod vga
|
|
|
903092 |
+ insmod video_bochs
|
|
|
903092 |
+ insmod video_cirrus
|
|
|
903092 |
+}
|
|
|
903092 |
+
|
|
|
903092 |
+set timeout=5
|
|
|
903092 |
+### END /etc/grub.d/00_header ###
|
|
|
903092 |
+
|
|
|
903092 |
+### BEGIN /etc/grub.d/10_linux ###
|
|
|
903092 |
+menuentry 'Linux, with Fedora 2.6.38.8-32.fc15.x86_64' --class gnu-linux --class gnu --class os {
|
|
|
903092 |
+ load_video
|
|
|
903092 |
+ set gfxpayload=keep
|
|
|
903092 |
+ insmod part_msdos
|
|
|
903092 |
+ insmod ext2
|
|
|
903092 |
+ set root='(hd0,msdos1)'
|
|
|
903092 |
+ search --no-floppy --fs-uuid --set=root df0170c9-7d05-415c-bbd1-d4d503ba0eed
|
|
|
903092 |
+ echo 'Loading Fedora 2.6.38.8-32.fc15.x86_64 ...'
|
|
|
903092 |
+ linux /vmlinuz-2.6.38.8-32.fc15.x86_64 root=/dev/mapper/vg_pjones5-lv_root ro quiet rhgb
|
|
|
903092 |
+ echo 'Loading initial ramdisk ...'
|
|
|
903092 |
+ initrd /initramfs-2.6.38.8-32.fc15.x86_64.img
|
|
|
903092 |
+}
|
|
|
903092 |
+### END /etc/grub.d/10_linux ###
|
|
|
903092 |
+
|
|
|
903092 |
+### BEGIN /etc/grub.d/20_linux_xen ###
|
|
|
903092 |
+### END /etc/grub.d/20_linux_xen ###
|
|
|
903092 |
+
|
|
|
903092 |
+### BEGIN /etc/grub.d/30_os-prober ###
|
|
|
903092 |
+### END /etc/grub.d/30_os-prober ###
|
|
|
903092 |
+
|
|
|
903092 |
+### BEGIN /etc/grub.d/40_custom ###
|
|
|
903092 |
+# This file provides an easy way to add custom menu entries. Simply type the
|
|
|
903092 |
+# menu entries you want to add after this comment. Be careful not to change
|
|
|
903092 |
+# the 'exec tail' line above.
|
|
|
903092 |
+### END /etc/grub.d/40_custom ###
|
|
|
903092 |
+
|
|
|
903092 |
+### BEGIN /etc/grub.d/41_custom ###
|
|
|
903092 |
+if [ -f $prefix/custom.cfg ]; then
|
|
|
903092 |
+ source $prefix/custom.cfg;
|
|
|
903092 |
+fi
|
|
|
903092 |
+### END /etc/grub.d/41_custom ###
|
|
|
903092 |
+
|
|
|
903092 |
+### BEGIN /etc/grub.d/90_persistent ###
|
|
|
903092 |
+### END /etc/grub.d/90_persistent ###
|
|
|
903092 |
--
|
|
|
903092 |
2.9.3
|
|
|
903092 |
|