Populate keyring at install

diff --git a/modules/pacman b/modules/pacman
index 8db3b97081230d5d89f8f1467eec05bf19b03f3c..5668cfa6dff56d5965ab2143fd0aeb322518d9c8 160000 (submodule)
--- a/modules/pacman
+++ b/modules/pacman
@@ -1 +1 @@
-Subproject commit 8db3b97081230d5d89f8f1467eec05bf19b03f3c
+Subproject commit 5668cfa6dff56d5965ab2143fd0aeb322518d9c8

diff --git a/scripts/arch_install_script.sh b/scripts/arch_install_script.sh
index 21e202f35af8452cd3b1bb264dd478a31c902e6c..d2c6107123a7205a017a41a3ecc538c18d0cbe3a 100755 (executable)
--- a/scripts/arch_install_script.sh
+++ b/scripts/arch_install_script.sh
@@ -6,6 +6,9 @@ CODE_PATH="/etc/puppetlabs/code"
 
 rm -rf $CODE_PATH
 
+pacman-key --init
+pacman-key --populate archlinux
+
 git clone -b $git_branch --recursive https://git.immae.eu/perso/Immae/Projets/Puppet.git $CODE_PATH
 puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp
 # The password seed requires puppet to be run twice

diff --git a/scripts/ovh_cloud_instance/arch_host_script.sh b/scripts/ovh_cloud_instance/arch_host_script.sh
index 34085633f7ffb5d4093829743ac5c4660fe2dbcd..42dcc4a9d8636e07e7d5323051d685ada2cacb04 100755 (executable)
--- a/scripts/ovh_cloud_instance/arch_host_script.sh
+++ b/scripts/ovh_cloud_instance/arch_host_script.sh
@@ -36,7 +36,7 @@ for i in /mnt/*; do
 done
 ##### /FIXME ####
 
-sudo pacstrap /mnt base git puppet
+sudo pacstrap -G /mnt base git puppet
 
 echo "$PART / auto defaults 0 1" | sudo tee /mnt/etc/fstab
 # /Install very basic system

diff --git a/scripts/ovh_vps_ssd/arch_chroot_script.sh b/scripts/ovh_vps_ssd/arch_chroot_script.sh
index 9dc5c467cebe2e441facfc6fcf513f331464ac1e..7b7887fd873f1f40e840383c05d31d6dc2bcd15f 100755 (executable)
--- a/scripts/ovh_vps_ssd/arch_chroot_script.sh
+++ b/scripts/ovh_vps_ssd/arch_chroot_script.sh
@@ -21,7 +21,7 @@ for i in /mnt/*; do
 done
 ##### /FIXME ####
 
-pacstrap /mnt base git puppet
+pacstrap -G /mnt base git puppet
 
 echo "$PART / auto defaults 0 1" > /mnt/etc/fstab