diff --git a/create-vmachine.sh b/create-vmachine.sh index c17502e..d994b2b 100755 --- a/create-vmachine.sh +++ b/create-vmachine.sh @@ -34,19 +34,20 @@ virsh -c qemu:///system vol-create-as ${POOL} ${VMNAME} 2G echo "Creating LVM volumes..." pvcreate /dev/${VG}/${VMNAME} vgcreate ${VMNAME} /dev/${VG}/${VMNAME} +lvcreate -nroot -L100M ${VMNAME} lvcreate -nhome -L200M ${VMNAME} lvcreate -nvar -L400M ${VMNAME} -lvcreate -nroot -l100%FREE ${VMNAME} +lvcreate -nusr -l100%FREE ${VMNAME} echo "Creating XFS filesystems..." -for fs in root home var; do +for fs in root home usr var; do mkfs.xfs -L$fs -q /dev/${VMNAME}/$fs done echo "Mounting filesystems..." [[ ! -d "${MOUNTPOINT}" ]] && mkdir -p "${MOUNTPOINT}" mount /dev/${VMNAME}/root "${MOUNTPOINT}" -for fs in home var; do +for fs in home usr var; do mkdir "${MOUNTPOINT}"/$fs mount /dev/${VMNAME}/$fs "${MOUNTPOINT}"/$fs done @@ -103,6 +104,7 @@ ln -s /etc/init.d/sshd "${MOUNTPOINT}"/etc/runlevels/default/ echo "Configuring fstab..." cat << EOF > "${MOUNTPOINT}"/etc/fstab LABEL=root / xfs noatime 0 1 +LABEL=usr /usr xfs noatime 0 2 LABEL=var /var xfs noatime 0 2 LABEL=home /home xfs noatime 0 2 tmpfs /tmp tmpfs defaults 0 0 @@ -151,7 +153,7 @@ sed -i 's/#s0/s0/' "${MOUNTPOINT}"/etc/inittab echo "Cleaning up..." umount "${MOUNTPOINT}"/usr/portage/{packages,distfiles,} rmdir "${MOUNTPOINT}"/usr/portage -umount "${MOUNTPOINT}"/{tmp,proc,sys,run,var,home,} +umount "${MOUNTPOINT}"/{tmp,proc,sys,run,usr,var,home,} vgchange -an ${VMNAME} echo "Creating libvirt domain..."