diff options
| -rw-r--r-- | http/install-chroot.sh | 32 | ||||
| -rw-r--r-- | http/install.sh | 2 | ||||
| -rw-r--r-- | vagrant.json | 8 |
3 files changed, 37 insertions, 5 deletions
diff --git a/http/install-chroot.sh b/http/install-chroot.sh index 7e71282..db65f60 100644 --- a/http/install-chroot.sh +++ b/http/install-chroot.sh @@ -8,6 +8,36 @@ sed -i -e 's/^#\(en_US.UTF-8\)/\1/' /etc/locale.gen locale-gen echo 'LANG=en_US.UTF-8' > /etc/locale.conf +# Updating to testing +cat <<EOF > /etc/pacman.conf + +[options] +HoldPkg = pacman glibc +Architecture = auto +CheckSpace + +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional + +[staging] +Include = /etc/pacman.d/mirrorlist + +[testing] +Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +[community-testing] +Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist +EOF + # setting vagrant user credentials echo -e 'vagrant\nvagrant' | passwd useradd -m -U vagrant @@ -55,3 +85,5 @@ systemctl enable systemd-resolved grub-install "$device" sed -i -e 's/^GRUB_TIMEOUT=.*$/GRUB_TIMEOUT=1/' /etc/default/grub grub-mkconfig -o /boot/grub/grub.cfg + +pacman -Syu --noconfirm diff --git a/http/install.sh b/http/install.sh index f59a368..d875249 100644 --- a/http/install.sh +++ b/http/install.sh @@ -31,7 +31,7 @@ rankmirrors -vn 6 /tmp/mirrorlist.backup > /etc/pacman.d/mirrorlist pacman --noconfirm -Sy archlinux32-keyring -pacstrap /mnt base grub openssh sudo polkit btrfs-progs +pacstrap /mnt base base-devel asp grub openssh sudo polkit btrfs-progs swapon "${device}1" genfstab -p /mnt >> /mnt/etc/fstab swapoff "${device}1" diff --git a/vagrant.json b/vagrant.json index 7333643..71591b2 100644 --- a/vagrant.json +++ b/vagrant.json @@ -17,7 +17,7 @@ "boot_wait": "{{user `boot_wait`}}", "http_directory": "http", "disk_size": "{{user `disk_size`}}", - "guest_os_type": "ArchLinux_64", + "guest_os_type": "ArchLinux", "iso_checksum_url": "{{user `iso_checksum_url`}}", "iso_checksum_type": "{{user `iso_checksum_type`}}", "iso_url": "{{user `iso_url`}}", @@ -149,21 +149,21 @@ "type": "vagrant-cloud", "only": ["virtualbox-iso"], "access_token": "{{user `atlas_token`}}", - "box_tag": "archlinux32/archlinux32", + "box_tag": "archlinux32/archlinux32-devel", "version": "{{isotime \"2006.01.02\"}}" }, { "type": "vagrant-cloud", "only": ["qemu"], "access_token": "{{user `atlas_token`}}", - "box_tag": "archlinux32/archlinux32", + "box_tag": "archlinux32/archlinux32-devel", "version": "{{isotime \"2006.01.02\"}}" }, { "type": "vagrant-cloud", "only": ["vmware-iso"], "access_token": "{{user `atlas_token`}}", - "box_tag": "archlinux32/archlinux32", + "box_tag": "archlinux32/archlinux32-devel", "version": "{{isotime \"2006.01.02\"}}" } ] |