Ryan Barry has uploaded a new change for review. Change subject: Use rd.live.check on Fedora ......................................................................
Use rd.live.check on Fedora "check" is deprecated as a bootloader option. Use "rd.live.check" instead. rhbz#902424 Change-Id: Ic98457d7f02bf404128e19ef04af05481ac2adb4 Signed-off-by: Ryan Barry <[email protected]> --- M configure.ac M recipe/common-install.ks A recipe/common-install.ks.in 3 files changed, 93 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/85/15585/1 diff --git a/configure.ac b/configure.ac index 81a077a..32f9144 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,8 @@ AM_CONDITIONAL(TARGET_FEDORA, test x"$FEDORA" != x) AM_CONDITIONAL(TARGET_RHEL, test x"$RHEL" != x && test x"$CENTOS" == x) AM_CONDITIONAL(TARGET_CENTOS, test x"$CENTOS" != x) -AM_CONDITIONAL(TARGET_SYSTEMD, test 0$RHEL -ge 7 || test 0$FEDORA -ge 16 || test 0$CENTOS -ge 7) +AM_CONDITIONAL(TARGET_SYSTEMD, test 0$RHEL -ge 7 || test 0$FEDORA -ge 15 || test 0$CENTOS -ge 7) +AM_CONDITIONAL(TARGET_RDLIVECHECK, test 0$RHEL -ge 7 || test 0$FEDORA -ge 16 || test 0$CENTOS -ge 7) AM_COND_IF([TARGET_SYSTEMD], [SYSTEMD_COMMENT=""], [SYSTEMD_COMMENT="#"]) @@ -30,6 +31,10 @@ [COLLECTD_COMMENT="#"], [COLLECTD_COMMENT=""]) AC_SUBST([SYSTEMD_COMMENT]) AC_SUBST([COLLECTD_COMMENT]) + +AM_COND_IF([TARGET_RDLIVECHECK], + [BOOTLOADER_CHECK="rd.live.check"], [BOOTLOADER_CHECK="check"]) +AC_SUBST([BOOTLOADER_CHECK]) AC_ARG_WITH([image-minimizer], [AC_HELP_STRING([--with-image-minimizer], [enable aggresive reduction of the image size])], @@ -77,6 +82,7 @@ modules/Makefile plugins/Makefile $MAIN_KS + recipe/common-install.ks recipe/image-minimizer.ks scripts/ovirt-functions scripts/ovirt-init-functions.sh diff --git a/recipe/common-install.ks b/recipe/common-install.ks index d3bafe1..1977d69 100644 --- a/recipe/common-install.ks +++ b/recipe/common-install.ks @@ -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="check rootflags=ro crashkernel=128M elevator=deadline install quiet rd_NO_LVM max_loop=256" +bootloader --timeout=30 --append="rd.live.check rootflags=ro crashkernel=128M elevator=deadline install quiet rd_NO_LVM max_loop=256" # not included by default in Fedora 10 livecd initramfs device virtio_blk diff --git a/recipe/common-install.ks.in b/recipe/common-install.ks.in new file mode 100644 index 0000000..eaa967a --- /dev/null +++ b/recipe/common-install.ks.in @@ -0,0 +1,85 @@ +lang en_US.utf8 +keyboard us +timezone --utc UTC +auth --useshadow --enablemd5 +selinux --enforcing +firewall --disabled +# TODO: the sizing of the image needs to be more dynamic +part / --size 1536 --fstype ext2 + +# 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_CHECK@ rootflags=ro crashkernel=128M elevator=deadline install quiet rd_NO_LVM max_loop=256" + +# not included by default in Fedora 10 livecd initramfs +device virtio_blk +device virtio_pci +device scsi_wait_scan + +# multipath kmods +device dm-multipath +device dm-round-robin +device dm-emc +device dm-rdac +device dm-hp-sw +device scsi_dh_rdac + +# add missing scsi modules to initramfs +device 3w-9xxx +device 3w-sas +device 3w-xxxx +device a100u2w +device aacraid +device aic79xx +device aic94xx +device arcmsr +device atp870u +device be2iscsi +device bfa +device BusLogic +device cciss +device cxgb3i +device dc395x +device fnic +device gdth +device hpsa +device hptiop +device imm +device initio +device ips +device isci +device libosd +device libsas +device libsrp +device lpfc +device megaraid +device megaraid_mbox +device megaraid_mm +device megaraid_sas +device mpt2sas +device mvsas +device osd +device osst +device pm8001 +device pmcraid +device qla1280 +device qla2xxx +device qla4xxx +device qlogicfas408 +device stex +device tmscsim +#usb mass storage devices / blade cd devices / similar +device ums-sddr09 +device ums-realtek +device ums-sddr55 +device ums-isd200 +device ums-alauda +device ums-freecom +device ums-cypress +device ums-jumpshot +device ums-onetouch +device ums-karma +device ums-usbat +device ums-datafab +device ums-eneub6250 -- To view, visit http://gerrit.ovirt.org/15585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic98457d7f02bf404128e19ef04af05481ac2adb4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: master Gerrit-Owner: Ryan Barry <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
