applications/vps2parch
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lvm2 is already in base group

Browse source
This commit is contained in:
Timothy Redaelli 2015-06-27 02:10:19 +02:00
parent 3dea66516e
commit a3f1a249db
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
vps2arch
View file

@ -30,7 +30,6 @@ else
fi fi
cpu_type=$(uname -m) cpu_type=$(uname -m)
findmnt -no SOURCE / | grep -q '^/dev/mapper/' && needs_lvm2=1 || needs_lvm2=0
download_and_extract_bootstrap() { download_and_extract_bootstrap() {
local sha1 filename local sha1 filename
@ -88,9 +87,6 @@ delete_all() {
install_packages() { install_packages() {
local packages="base grub openssh" local packages="base grub openssh"
if [ $needs_lvm2 -eq 1 ]; then
packages="$packages lvm2"
fi
# You can't use chroot_exec here, because the root filesystem was deleted! # You can't use chroot_exec here, because the root filesystem was deleted!
"/root.$cpu_type/usr/bin/busybox" chroot "/root.$cpu_type" /usr/bin/pacstrap /mnt $packages "/root.$cpu_type/usr/bin/busybox" chroot "/root.$cpu_type" /usr/bin/pacstrap /mnt $packages
cp -L "/root.$cpu_type/etc/resolv.conf" /etc cp -L "/root.$cpu_type/etc/resolv.conf" /etc
@ -113,7 +109,8 @@ cleanup() {
} }
configure_bootloader() { configure_bootloader() {
local root_dev=$(findmnt -no SOURCE /) root_devs= tmp= local root_dev=$(findmnt -no SOURCE /) root_devs= tmp= needs_lvm2=0
findmnt -no SOURCE / | grep -q '^/dev/mapper/' && needs_lvm2=1
# If you are still using eth* as interface name, disable "strange" ifnames # If you are still using eth* as interface name, disable "strange" ifnames
if grep -q '^\s*eth' /proc/net/dev; then if grep -q '^\s*eth' /proc/net/dev; then