[node-patches] Change in ovirt-node[ovirt-3.5]: Bump crashkernel size to 256M on EL7
fabiand at redhat.com
fabiand at redhat.com
Tue Jan 13 16:04:54 UTC 2015
Hello Ryan Barry,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/36866
to review the following change.
Change subject: Bump crashkernel size to 256M on EL7
......................................................................
Bump crashkernel size to 256M on EL7
To prep for dmsquash-live changes for kdump, bump the crashkernel
size up. Parameterize that in common-install, and convert
common-efi to a parameterized file so the installer options match
on EFI and non-EFI systems.
Also, don't use rd.lvm=0 on EL7 -- it prevents the kdump kernel
from mounting the local dump target.
Change-Id: I4e8f051bf4aa5cec138143d51048de22dcd68105
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1180371
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1180377
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1095140
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M configure.ac
D recipe/common-efi.ks
A recipe/common-efi.ks.in
M recipe/common-install.ks.in
4 files changed, 80 insertions(+), 79 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/66/36866/1
diff --git a/configure.ac b/configure.ac
index 128fe28..6c41b20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,7 @@
AC_SUBST([DRACUTDIR])
AM_COND_IF([TARGET_RDLIVECHECK],
- [BOOTLOADER_ARGS="rd.live.check rd.lvm=0"], [BOOTLOADER_ARGS="check RD_NO_LVM"])
+ [BOOTLOADER_ARGS="rd.live.check crashkernel=256M"], [BOOTLOADER_ARGS="check RD_NO_LVM crashkernel=128M"])
AC_SUBST([BOOTLOADER_ARGS])
AC_ARG_WITH([image-minimizer], [AC_HELP_STRING([--with-image-minimizer],
@@ -128,6 +128,7 @@
plugins/Makefile
tests/Makefile
$MAIN_KS
+ recipe/common-efi.ks
recipe/common-install.ks
recipe/dracut-post.ks
recipe/image-minimizer.ks
diff --git a/recipe/common-efi.ks b/recipe/common-efi.ks
deleted file mode 100644
index 1ba6fd4..0000000
--- a/recipe/common-efi.ks
+++ /dev/null
@@ -1,77 +0,0 @@
-# create grub/grub2 efi boot configuation
-
-if [ ! -d $LIVE_ROOT/EFI/BOOT ]; then
- mkdir -p $LIVE_ROOT/EFI/BOOT
-fi
-
-if [ ! -e $INSTALL_ROOT/sbin/grub2-install ]; then
- cat > $LIVE_ROOT/EFI/BOOT/BOOTX64.conf <<EOF
-default=0
-splashimage=/EFI/BOOT/splash.xpm.gz
-timeout 30
-hiddenmenu
-title Install / Upgrade ${PRODUCT_SHORT}-$VERSION-$RELEASE
- kernel /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0
- initrd /isolinux/initrd0.img
-title Install / Upgrade (Basic Video) ${PRODUCT_SHORT}-$VERSION-$RELEASE
- kernel /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 nomodeset
- initrd /isolinux/initrd0.img
-title Install / Upgrade with serial console ${PRODUCT_SHORT}-$VERSION-$RELEASE
- kernel /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 console=ttyS0,115200n8
- initrd /isolinux/initrd0.img
-title Reinstall ${PRODUCT_SHORT}-$VERSION-$RELEASE
- kernel /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 reinstall
- initrd /isolinux/initrd0.img
-title Reinstall (Basic Video) ${PRODUCT_SHORT}-$VERSION-$RELEASE
- kernel /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 reinstall nomodeset
- initrd /isolinux/initrd0.img
-title Reinstall with serial console ${PRODUCT_SHORT}-$VERSION-$RELEASE
- kernel /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 reinstall console=ttyS0,115200n8
- initrd /isolinux/initrd0.img
-title Uninstall
- kernel /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 uninstall
- initrd /isolinux/initrd0.img
-EOF
-else
- cat > $LIVE_ROOT/EFI/BOOT/BOOTX64.conf <<EOF
-set default="0"
-
-function load_video {
- insmod efi_gop
- insmod efi_uga
- insmod video_bochs
- insmod video_cirrus
- insmod all_video
-}
-
-load_video
-set gfxpayload=keep
-insmod gzio
-insmod part_gpt
-insmod ext2
-
-set timeout=30
-
-menuentry 'Install or Upgrade ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os {
- linuxefi /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0
- initrdefi /isolinux/initrd0.img
-}
-menuentry 'Install or Upgrade with serial console ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os {
- linuxefi /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 console=ttyS0,115200n8
- initrdefi /isolinux/initrd0.img
-}
-menuentry 'Reinstall ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os {
- linuxefi /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 reinstall
- initrdefi /isolinux/initrd0.img
-}
-menuentry 'Reinstall with serial console ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os {
- linuxefi /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 reinstall console=ttyS0,115200n8
- initrdefi /isolinux/initrd0.img
-}
-menuentry 'Uninstall' --class fedora --class gnu-linux --class gnu --class os {
- linuxefi /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 uninstall
- initrdefi /isolinux/initrd0.img
-}
-EOF
-fi
-cp $LIVE_ROOT/EFI/BOOT/BOOTX64.conf $LIVE_ROOT/EFI/BOOT/grub.cfg
diff --git a/recipe/common-efi.ks.in b/recipe/common-efi.ks.in
new file mode 100644
index 0000000..d52eeb7
--- /dev/null
+++ b/recipe/common-efi.ks.in
@@ -0,0 +1,77 @@
+# create grub/grub2 efi boot configuation
+
+if [ ! -d $LIVE_ROOT/EFI/BOOT ]; then
+ mkdir -p $LIVE_ROOT/EFI/BOOT
+fi
+
+if [ ! -e $INSTALL_ROOT/sbin/grub2-install ]; then
+ cat > $LIVE_ROOT/EFI/BOOT/BOOTX64.conf <<EOF
+default=0
+splashimage=/EFI/BOOT/splash.xpm.gz
+timeout 30
+hiddenmenu
+title Install / Upgrade ${PRODUCT_SHORT}-$VERSION-$RELEASE
+ kernel /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0
+ initrd /isolinux/initrd0.img
+title Install / Upgrade (Basic Video) ${PRODUCT_SHORT}-$VERSION-$RELEASE
+ kernel /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 nomodeset
+ initrd /isolinux/initrd0.img
+title Install / Upgrade with serial console ${PRODUCT_SHORT}-$VERSION-$RELEASE
+ kernel /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 console=ttyS0,115200n8
+ initrd /isolinux/initrd0.img
+title Reinstall ${PRODUCT_SHORT}-$VERSION-$RELEASE
+ kernel /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 reinstall
+ initrd /isolinux/initrd0.img
+title Reinstall (Basic Video) ${PRODUCT_SHORT}-$VERSION-$RELEASE
+ kernel /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 reinstall nomodeset
+ initrd /isolinux/initrd0.img
+title Reinstall with serial console ${PRODUCT_SHORT}-$VERSION-$RELEASE
+ kernel /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 reinstall console=ttyS0,115200n8
+ initrd /isolinux/initrd0.img
+title Uninstall
+ kernel /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 uninstall
+ initrd /isolinux/initrd0.img
+EOF
+else
+ cat > $LIVE_ROOT/EFI/BOOT/BOOTX64.conf <<EOF
+set default="0"
+
+function load_video {
+ insmod efi_gop
+ insmod efi_uga
+ insmod video_bochs
+ insmod video_cirrus
+ insmod all_video
+}
+
+load_video
+set gfxpayload=keep
+insmod gzio
+insmod part_gpt
+insmod ext2
+
+set timeout=30
+
+menuentry 'Install or Upgrade ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os {
+ linuxefi /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0
+ initrdefi /isolinux/initrd0.img
+}
+menuentry 'Install or Upgrade with serial console ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os {
+ linuxefi /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 console=ttyS0,115200n8
+ initrdefi /isolinux/initrd0.img
+}
+menuentry 'Reinstall ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os {
+ linuxefi /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 reinstall
+ initrdefi /isolinux/initrd0.img
+}
+menuentry 'Reinstall with serial console ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os {
+ linuxefi /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 reinstall console=ttyS0,115200n8
+ initrdefi /isolinux/initrd0.img
+}
+menuentry 'Uninstall' --class fedora --class gnu-linux --class gnu --class os {
+ linuxefi /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 uninstall
+ initrdefi /isolinux/initrd0.img
+}
+EOF
+fi
+cp $LIVE_ROOT/EFI/BOOT/BOOTX64.conf $LIVE_ROOT/EFI/BOOT/grub.cfg
diff --git a/recipe/common-install.ks.in b/recipe/common-install.ks.in
index 6e5ffb5..9ed8cdd 100644
--- a/recipe/common-install.ks.in
+++ b/recipe/common-install.ks.in
@@ -10,7 +10,7 @@
# additional default boot parameters
# Need to use deadline Scheduler for performance, rhbz#647301
# VM timekeeping: Do not allow C2 state, rhbz#647300
-bootloader --timeout=30 --append="@BOOTLOADER_ARGS@ rd_NO_MULTIPATH rootflags=ro crashkernel=128M elevator=deadline install quiet max_loop=256"
+bootloader --timeout=30 --append="@BOOTLOADER_ARGS@ rd_NO_MULTIPATH rootflags=ro elevator=deadline install quiet max_loop=256"
# not included by default in Fedora 10 livecd initramfs
device virtio_blk
--
To view, visit http://gerrit.ovirt.org/36866
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e8f051bf4aa5cec138143d51048de22dcd68105
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Ryan Barry <rbarry at redhat.com>
More information about the node-patches
mailing list