[node-patches] Change in ovirt-node[master]: Disable multipath for install, but leave it otherwise
rbarry at redhat.com
rbarry at redhat.com
Thu Dec 5 18:05:38 UTC 2013
Ryan Barry has uploaded a new change for review.
Change subject: Disable multipath for install, but leave it otherwise
......................................................................
Disable multipath for install, but leave it otherwise
Previously, using multipath-capable devices for the install
sometimes paniced without being able to find root. With the
addition of an option to dracut to disable it, we now remove
multipath support during the install phase, but leave it in the
bootloader arguments for normal booting
Change-Id: Ie5a3fa380c6561669dab843e14ae320d5fb4f3a2
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=856877
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M recipe/common-efi.ks
M recipe/common-install.ks.in
M src/ovirtnode/install.py
3 files changed, 19 insertions(+), 16 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/09/22109/1
diff --git a/recipe/common-efi.ks b/recipe/common-efi.ks
index f872345..1d47677 100644
--- a/recipe/common-efi.ks
+++ b/recipe/common-efi.ks
@@ -7,25 +7,25 @@
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_LVM rd.luks=0 rd.md=0 rd.dm=0
+ 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_LVM rd.luks=0 rd.md=0 rd.dm=0 nomodeset
+ 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_LVM rd.luks=0 rd.md=0 rd.dm=0 console=ttyS0,115200n8
+ 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_LVM rd.luks=0 rd.md=0 rd.dm=0 reinstall
+ 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_LVM rd.luks=0 rd.md=0 rd.dm=0 reinstall nomodeset
+ 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_LVM rd.luks=0 rd.md=0 rd.dm=0 reinstall console=ttyS0,115200n8
+ 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_LVM rd.luks=0 rd.md=0 rd.dm=0 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
@@ -49,31 +49,31 @@
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_LVM rd.luks=0 rd.md=0 rd.dm=0
+ 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 (Basic Video) ${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_LVM rd.luks=0 rd.md=0 rd.dm=0 nomodeset
+ 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 nomodeset
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_LVM rd.luks=0 rd.md=0 rd.dm=0 console=ttyS0,115200n8
+ 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_LVM rd.luks=0 rd.md=0 rd.dm=0 reinstall
+ 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 (Basic Video) ${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_LVM rd.luks=0 rd.md=0 rd.dm=0 reinstall nomodeset
+ 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 nomodeset
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_LVM rd.luks=0 rd.md=0 rd.dm=0 reinstall console=ttyS0,115200n8
+ 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_LVM rd.luks=0 rd.md=0 rd.dm=0 uninstall
+ 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
diff --git a/recipe/common-install.ks.in b/recipe/common-install.ks.in
index 66e19e7..35f5672 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@ rootflags=ro crashkernel=128M elevator=deadline install quiet max_loop=256"
+bootloader --timeout=30 --append="@BOOTLOADER_ARGS@ rd_NO_MULTIPATH rootflags=ro crashkernel=128M elevator=deadline install quiet max_loop=256"
# not included by default in Fedora 10 livecd initramfs
device virtio_blk
diff --git a/src/ovirtnode/install.py b/src/ovirtnode/install.py
index 3b51723..2bebdb9 100755
--- a/src/ovirtnode/install.py
+++ b/src/ovirtnode/install.py
@@ -510,7 +510,10 @@
self.root_param = "root=live:LABEL=Root"
self.bootparams = "ro rootfstype=auto rootflags=ro "
self.bootparams += OVIRT_VARS["OVIRT_BOOTPARAMS"].replace(
- "console=tty0", "")
+ "console=tty0", ""
+ ).replace(
+ "rd_NO_MULTIPATH",
+ "")
if " " in self.disk or os.path.exists("/dev/cciss"):
# workaround for grub setup failing with spaces in dev.name:
# use first active sd* device
--
To view, visit http://gerrit.ovirt.org/22109
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5a3fa380c6561669dab843e14ae320d5fb4f3a2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>
More information about the node-patches
mailing list