Andrew Bogott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/185195

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, 3 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/185195/1

diff --git a/modules/labs_bootstrapvz/files/firstboot.sh 
b/modules/labs_bootstrapvz/files/firstboot.sh
index f07b209..10868cc 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -73,21 +73,16 @@
 # 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/tar cf - -C / var/log | /bin/tar xf - -C /tmp/var
   /bin/umount /tmp/var/log
-  /bin/umount /tmp/var
-  echo "/dev/mapper/vd-var /var ext4 defaults 0 0" >>/etc/fstab
   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: newchange
Gerrit-Change-Id: I14f5052067536f335a00015290efd267ff7eb5e5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to