|
 |
cca0c4 |
From ae22f8322d2f2dccd19003fccd390fe19f7126c1 Mon Sep 17 00:00:00 2001
|
|
|
cca0c4 |
From: Peter Jones <pjones@redhat.com>
|
|
|
cca0c4 |
Date: Mon, 26 Oct 2015 14:22:39 -0400
|
|
|
cca0c4 |
Subject: [PATCH 19/55] Always do the "rungrubby --debug" after the normal
|
|
|
cca0c4 |
kernel on install.
|
|
|
cca0c4 |
|
|
|
cca0c4 |
This way the during an update, the right kernel is picked as "default"
|
|
|
cca0c4 |
for the command line arguments.
|
|
|
cca0c4 |
|
|
|
cca0c4 |
Related: rhbz#1212128
|
|
|
cca0c4 |
|
|
|
cca0c4 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
cca0c4 |
---
|
|
|
cca0c4 |
new-kernel-pkg | 20 ++++++++++----------
|
|
|
cca0c4 |
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
cca0c4 |
|
|
|
cca0c4 |
diff --git a/new-kernel-pkg b/new-kernel-pkg
|
|
|
cca0c4 |
index 9f56c470b4a..9574dbbf10b 100755
|
|
|
cca0c4 |
--- a/new-kernel-pkg
|
|
|
cca0c4 |
+++ b/new-kernel-pkg
|
|
|
cca0c4 |
@@ -243,8 +243,8 @@ install() {
|
|
|
cca0c4 |
--args=\"root=$rootdevice $kernargs \$debugargs\" \
|
|
|
cca0c4 |
--remove-kernel=\"TITLE=$title\$debugtitle\""
|
|
|
cca0c4 |
|
|
|
cca0c4 |
- rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
rungrubby ${ARGS} $makedefault
|
|
|
cca0c4 |
+ rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
else
|
|
|
cca0c4 |
[ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby for grub 0.97"
|
|
|
cca0c4 |
fi
|
|
|
cca0c4 |
@@ -257,8 +257,8 @@ install() {
|
|
|
cca0c4 |
${mbargs:+--mbargs=\"$mbargs\"} \
|
|
|
cca0c4 |
--args=\"root=$rootdevice $kernargs \$debugargs\" \
|
|
|
cca0c4 |
--remove-kernel=\"TITLE=$title\$debugtitle\""
|
|
|
cca0c4 |
- rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
rungrubby ${ARGS} $makedefault
|
|
|
cca0c4 |
+ rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
else
|
|
|
cca0c4 |
[ -n "$verbose" ] && echo "$grub2Config does not exist, not running grubby for grub 2"
|
|
|
cca0c4 |
fi
|
|
|
cca0c4 |
@@ -272,8 +272,8 @@ install() {
|
|
|
cca0c4 |
${mbargs:+--mbargs=\"$mbargs\"} \
|
|
|
cca0c4 |
--args=\"root=$rootdevice $kernargs \$debugargs\" \
|
|
|
cca0c4 |
--remove-kernel=\"TITLE=$title\$debugtitle\""
|
|
|
cca0c4 |
- rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
rungrubby ${ARGS} $makedefault
|
|
|
cca0c4 |
+ rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
else
|
|
|
cca0c4 |
[ -n "$verbose" ] && echo "$grub2EfiConfig does not exist, not running grubby for grub 2 with UEFI"
|
|
|
cca0c4 |
fi
|
|
|
cca0c4 |
@@ -288,8 +288,8 @@ install() {
|
|
|
cca0c4 |
--args=\"root=$rootdevice $kernargs \$debugargs\" \
|
|
|
cca0c4 |
--remove-kernel=\"TITLE=$version\""
|
|
|
cca0c4 |
|
|
|
cca0c4 |
- rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
rungrubby ${ARGS} $makedefault
|
|
|
cca0c4 |
+ rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
if [ -n "$runLilo" ]; then
|
|
|
cca0c4 |
[ -n "$verbose" ] && echo "running $lilo"
|
|
|
cca0c4 |
if [ ! -x $lilo ] ; then
|
|
|
cca0c4 |
@@ -313,8 +313,8 @@ install() {
|
|
|
cca0c4 |
--args=\"root=$rootdevice $kernargs \$debugargs\" \
|
|
|
cca0c4 |
--remove-kernel=\"TITLE=$title\$debugtitle\""
|
|
|
cca0c4 |
|
|
|
cca0c4 |
- rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
rungrubby ${ARGS} $makedefault
|
|
|
cca0c4 |
+ rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
else
|
|
|
cca0c4 |
[ -n "$verbose" ] && echo "$extlinuxConfig does not exist, not running grubby for extlinux"
|
|
|
cca0c4 |
fi
|
|
|
cca0c4 |
@@ -480,8 +480,8 @@ update() {
|
|
|
cca0c4 |
${mbkernel:+--add-multiboot=\"$mbkernel\"} \
|
|
|
cca0c4 |
--title=\"$title\$debugtitle\""
|
|
|
cca0c4 |
|
|
|
cca0c4 |
- rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
rungrubby ${ARGS}
|
|
|
cca0c4 |
+ rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
else
|
|
|
cca0c4 |
[ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby"
|
|
|
cca0c4 |
fi
|
|
|
cca0c4 |
@@ -493,8 +493,8 @@ update() {
|
|
|
cca0c4 |
${removeargs:+--remove-args=\"$removeargs\"} \
|
|
|
cca0c4 |
--title=\"$title\$debugtitle\""
|
|
|
cca0c4 |
|
|
|
cca0c4 |
- rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
rungrubby ${ARGS}
|
|
|
cca0c4 |
+ rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
else
|
|
|
cca0c4 |
[ -n "$verbose" ] && echo "$grub2Config does not exist, not running grubby"
|
|
|
cca0c4 |
fi
|
|
|
cca0c4 |
@@ -506,8 +506,8 @@ update() {
|
|
|
cca0c4 |
${removeargs:+--remove-args=\"$removeargs\"} \
|
|
|
cca0c4 |
--title=\"$title\$debugtitle\""
|
|
|
cca0c4 |
|
|
|
cca0c4 |
- rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
rungrubby ${ARGS}
|
|
|
cca0c4 |
+ rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
else
|
|
|
cca0c4 |
[ -n "$verbose" ] && echo "$grub2EfiConfig does not exist, not running grubby"
|
|
|
cca0c4 |
fi
|
|
|
cca0c4 |
@@ -519,8 +519,8 @@ update() {
|
|
|
cca0c4 |
${removeargs:+--remove-args=\"$removeargs\"} \
|
|
|
cca0c4 |
--title=\"$title\$debugtitle\""
|
|
|
cca0c4 |
|
|
|
cca0c4 |
- rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
rungrubby ${ARGS}
|
|
|
cca0c4 |
+ rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
|
|
|
cca0c4 |
if [ -n "$runLilo" ]; then
|
|
|
cca0c4 |
[ -n "$verbose" ] && echo "running $lilo"
|
|
|
cca0c4 |
@@ -571,8 +571,8 @@ update() {
|
|
|
cca0c4 |
${removeargs:+--remove-args=\"$removeargs\"} \
|
|
|
cca0c4 |
--title=\"$title\$debugtitle\""
|
|
|
cca0c4 |
|
|
|
cca0c4 |
- rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
rungrubby ${ARGS}
|
|
|
cca0c4 |
+ rungrubby --debug ${ARGS}
|
|
|
cca0c4 |
else
|
|
|
cca0c4 |
[ -n "$verbose" ] && echo "$extlinuxConfig does not exist, not running grubby"
|
|
|
cca0c4 |
fi
|
|
|
cca0c4 |
--
|
|
|
cca0c4 |
2.17.1
|
|
|
cca0c4 |
|