From 4772e48cc9e2e6ed39776b007cbf0d5514f4c7b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 19 Mar 2018 19:06:22 +0100 Subject: [PATCH] Populate keyring at install --- modules/pacman | 2 +- scripts/arch_install_script.sh | 3 +++ scripts/ovh_cloud_instance/arch_host_script.sh | 2 +- scripts/ovh_vps_ssd/arch_chroot_script.sh | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/pacman b/modules/pacman index 8db3b97..5668cfa 160000 --- 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 21e202f..d2c6107 100755 --- 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 3408563..42dcc4a 100755 --- 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 9dc5c46..7b7887f 100755 --- 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 -- 2.41.0