| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From 7a72139d2e3cc80f64090a823afe7bcea76e4792 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jackie Huang <jackie.huang@windriver.com> |
| 3 | Date: Tue, 4 Aug 2015 23:54:41 -0700 |
| 4 | Subject: [PATCH] rename grub2-editenv to grub-editenv |
| 5 | |
| 6 | We don't use the name grub2-editenv for grub2. |
| 7 | |
| 8 | Upstream-Status: Inactive-Upstream [lastcommit: 2022 lastrelease: 2016] |
| 9 | |
| 10 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
| 11 | --- |
| 12 | grubby.c | 4 ++-- |
| 13 | test.sh | 8 ++++---- |
| 14 | 2 files changed, 6 insertions(+), 6 deletions(-) |
| 15 | |
| 16 | diff --git a/grubby.c b/grubby.c |
| 17 | index 98c1516..be832f6 100644 |
| 18 | --- a/grubby.c |
| 19 | +++ b/grubby.c |
| 20 | @@ -301,7 +301,7 @@ static char *grub2GetEnv(struct configFileInfo *info, char *name) |
| 21 | char *ret = NULL; |
| 22 | char *envFile = info->envFile ? info->envFile : "/boot/grub2/grubenv"; |
| 23 | int rc = |
| 24 | - asprintf(&s, "grub2-editenv %s list | grep '^%s='", envFile, name); |
| 25 | + asprintf(&s, "grub-editenv %s list | grep '^%s='", envFile, name); |
| 26 | |
| 27 | if (rc < 0) |
| 28 | return NULL; |
| 29 | @@ -373,7 +373,7 @@ static int grub2SetEnv(struct configFileInfo *info, char *name, char *value) |
| 30 | if (!value) |
| 31 | return -1; |
| 32 | |
| 33 | - rc = asprintf(&s, "grub2-editenv %s set '%s=%s'", envFile, name, value); |
| 34 | + rc = asprintf(&s, "grub-editenv %s set '%s=%s'", envFile, name, value); |
| 35 | free(value); |
| 36 | if (rc < 0) |
| 37 | return -1; |
| 38 | diff --git a/test.sh b/test.sh |
| 39 | index 33d24cf..009479c 100755 |
| 40 | --- a/test.sh |
| 41 | +++ b/test.sh |
| 42 | @@ -573,7 +573,7 @@ if [ "$testgrub2" == "y" ]; then |
| 43 | --remove-kernel=/boot/vmlinuz-2.6.38.2-9.fc15.x86_64 \ |
| 44 | --boot-filesystem=/boot/ |
| 45 | commandTest "saved_default output" \ |
| 46 | - "grub2-editenv test/grub2-support_files/env_temp list" \ |
| 47 | + "grub-editenv test/grub2-support_files/env_temp list" \ |
| 48 | "saved_entry=Linux, with Fedora 2.6.38.8-32.fc15.x86_64" |
| 49 | |
| 50 | # copy a stanza and add arguments as well, while using --set-index= |
| 51 | @@ -627,7 +627,7 @@ if [ "$testgrub2" == "y" ]; then |
| 52 | --title='title' --initrd=/boot/new-initrd --boot-filesystem=/boot/ \ |
| 53 | --copy-default |
| 54 | commandTest "saved_default output" \ |
| 55 | - "grub2-editenv test/grub2-support_files/env_temp list" \ |
| 56 | + "grub-editenv test/grub2-support_files/env_temp list" \ |
| 57 | "saved_entry=Linux, with Fedora 2.6.38.8-32.fc15.x86_64" |
| 58 | |
| 59 | testing="GRUB2 add kernel with default=saved_entry and a terrible title" |
| 60 | @@ -640,13 +640,13 @@ if [ "$testgrub2" == "y" ]; then |
| 61 | testing="GRUB2 set default with default=saved_entry and a terrible name" |
| 62 | grub2Test grub2.9 add/g2-1.9 --env grubenv.1 --set-default-index=0 |
| 63 | commandTest "saved_default output" \ |
| 64 | - "grub2-editenv test/grub2-support_files/env_temp list" \ |
| 65 | + "grub-editenv test/grub2-support_files/env_temp list" \ |
| 66 | 'saved_entry=Fedora (3.10.3-300.fc19.x86_64) 19 (Schrödinger’s Cat)' |
| 67 | |
| 68 | testing="GRUB2 set default with default=saved_entry" |
| 69 | grub2Test grub2.8 add/g2-1.8 --env grubenv.1 --set-default-index=0 |
| 70 | commandTest "saved_default output" \ |
| 71 | - "grub2-editenv test/grub2-support_files/env_temp list" \ |
| 72 | + "grub-editenv test/grub2-support_files/env_temp list" \ |
| 73 | "saved_entry=title" |
| 74 | |
| 75 | testing="GRUB2 --default-index with default=saved_entry" |
| 76 | -- |
| 77 | 2.25.1 |
| 78 | |