Alexandros Kosiaris has submitted this change and it was merged. Change subject: Some minor cleanups in osmlabsdb.cfg ......................................................................
Some minor cleanups in osmlabsdb.cfg Some comments, better alignment, move the swap to the end and reordering Change-Id: I11d19dee509b112b86e7060fe644e940bff25910 --- M modules/install-server/files/autoinstall/partman/osmlabsdb.cfg 1 file changed, 18 insertions(+), 18 deletions(-) Approvals: Alexandros Kosiaris: Verified; Looks good to me, approved diff --git a/modules/install-server/files/autoinstall/partman/osmlabsdb.cfg b/modules/install-server/files/autoinstall/partman/osmlabsdb.cfg index e169f88..ff0d5bf 100644 --- a/modules/install-server/files/autoinstall/partman/osmlabsdb.cfg +++ b/modules/install-server/files/autoinstall/partman/osmlabsdb.cfg @@ -7,22 +7,17 @@ d-i partman-auto/method string lvm -d-i partman-auto/disk string /dev/sda - # the install makes sure we want to wipe the lvm/raid config d-i partman-lvm/device_remove_lvm boolean true d-i partman-md/device_remove_md boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite true + +# Use the hardware raid +d-i partman-auto/disk string /dev/sda # This makes partman automatically partition without confirmation, provided # that you told it what to do using one of the methods above. -d-i partman-partitioning/confirm_write_new_label boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true - -d-i partman-auto/expert_recipe string osmdb :: \ +d-i partman-auto/expert_recipe string \ + osmdb :: \ 40 300 300 ext3 \ $primary{ } \ $bootable{ } \ @@ -32,12 +27,6 @@ filesystem{ ext3 } \ mountpoint{ /boot } \ . \ - 8000 8000 8000 linux-swap \ - method{ swap } \ - $lvmok{ } \ - lv_name { swap } \ - format{ } \ - . 1000000 1000000 1000000 ext3 \ $lvmok{ } \ lv_name{ root } \ @@ -46,8 +35,19 @@ use_filesystem{ } \ filesystem{ ext3 } \ mountpoint{ / } \ + . \ + 8000 8000 8000 linux-swap \ + method{ swap } \ + $lvmok{ } \ + lv_name { swap } \ + format{ } \ . -d-i partman-auto-lvm/guided_size string 80% +d-i partman-partitioning/confirm_write_new_label boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true -d-i partman-auto/choose_recipe osmdb +d-i partman-auto-lvm/guided_size string 80% +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite true -- To view, visit https://gerrit.wikimedia.org/r/116122 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I11d19dee509b112b86e7060fe644e940bff25910 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org> Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits