Andrew Bogott has submitted this change and it was merged. Change subject: Mount /var/log on lvm but not /var ......................................................................
Mount /var/log on lvm but not /var Change-Id: I14f5052067536f335a00015290efd267ff7eb5e5 --- M modules/labs_bootstrapvz/files/firstboot.sh 1 file changed, 6 insertions(+), 12 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved coren: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/labs_bootstrapvz/files/firstboot.sh b/modules/labs_bootstrapvz/files/firstboot.sh index f07b209..6492718 100644 --- a/modules/labs_bootstrapvz/files/firstboot.sh +++ b/modules/labs_bootstrapvz/files/firstboot.sh @@ -73,21 +73,15 @@ # If we don't have a /var, we create it and /var/log, # move everything to it, and forcibly reboot now to try # everything anew -if ! /bin/egrep -q '^\S+\s+/var\s' /etc/fstab +if ! /bin/egrep -q '^\S+\s+/var/log\s' /etc/fstab then - echo 'Creating /var and /var/log volumes' - /sbin/lvcreate -L 2G -n var vd - /sbin/mkfs -t ext4 /dev/mapper/vd-var + echo 'Creating /var/log volume' /sbin/lvcreate -L 2G -n log vd /sbin/mkfs -t ext4 /dev/mapper/vd-log - /bin/mkdir -p /tmp/var - /bin/mount /dev/mapper/vd-var /tmp/var - /bin/mkdir -p /tmp/var/log - /bin/mount /dev/mapper/vd-log /tmp/var/log - /bin/tar cf - -C / var | /bin/tar xf - -C /tmp - /bin/umount /tmp/var/log - /bin/umount /tmp/var - echo "/dev/mapper/vd-var /var ext4 defaults 0 0" >>/etc/fstab + /bin/mkdir -p /tmp/log + /bin/mount /dev/mapper/vd-log /tmp/log + /bin/tar cf - -C /var log | /bin/tar xf - -C /tmp + /bin/umount /tmp/log echo "/dev/mapper/vd-log /var/log ext4 defaults 0 0" >>/etc/fstab # We're all done. Now all that's left is to reboot making sure -- To view, visit https://gerrit.wikimedia.org/r/185195 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I14f5052067536f335a00015290efd267ff7eb5e5 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> Gerrit-Reviewer: coren <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
