aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2018-01-02 22:04:44 -0200
committerSilvio Rhatto <rhatto@riseup.net>2018-01-02 22:04:44 -0200
commit879ddc0de40ed4f4d0fd82f8e2af435fc3978f5d (patch)
tree8bac222ada30000985271f6c0c1f5e273a8e9406
parent00890f444f764912b1b63a0d2065a402580d0585 (diff)
downloadhydra-879ddc0de40ed4f4d0fd82f8e2af435fc3978f5d.tar.gz
hydra-879ddc0de40ed4f4d0fd82f8e2af435fc3978f5d.tar.bz2
Use https://deb.debian.org/debian/ mirror when possible and adds --force-check-gpg into debootstrap
-rwxr-xr-xshare/hydractl/provision4
-rwxr-xr-xshare/hydractl/provision-chroot4
-rwxr-xr-xshare/hydractl/provision-raspi4
3 files changed, 6 insertions, 6 deletions
diff --git a/share/hydractl/provision b/share/hydractl/provision
index 8cf112e..938b28e 100755
--- a/share/hydractl/provision
+++ b/share/hydractl/provision
@@ -108,7 +108,7 @@ function hydra_provision_config {
hydra_user_config version stretch "Distro version"
hydra_user_config vg $hostname "Install vg"
hydra_user_config grub y "Setup GRUB? (y/n)"
- hydra_user_config mirror http://http.debian.net/debian/ "Debian mirror"
+ hydra_user_config mirror https://deb.debian.org/debian/ "Debian mirror"
hydra_user_config ssh y "Install openssh-server? (y/n)"
# Check arch
@@ -309,7 +309,7 @@ APT_INSTALL="hydra_sudo_run LC_ALL=C DEBIAN_FRONTEND=noninteractive chroot $WORK
# Initial system install.
echo "Installing base system..."
-hydra_sudo_run LC_ALL=C DEBIAN_FRONTEND=noninteractive debootstrap --arch=$arch $version $WORK/ $mirror
+hydra_sudo_run LC_ALL=C DEBIAN_FRONTEND=noninteractive debootstrap --force-check-gpg --arch=$arch $version $WORK/ $mirror
# Initial configuration.
echo "Applying initial configuration..."
diff --git a/share/hydractl/provision-chroot b/share/hydractl/provision-chroot
index e8ce9b5..7d518f8 100755
--- a/share/hydractl/provision-chroot
+++ b/share/hydractl/provision-chroot
@@ -27,7 +27,7 @@ function hydra_provision_config {
hydra_user_config domain example.org "Domain"
hydra_user_config arch amd64 "System arch"
hydra_user_config version stretch "Distro version"
- hydra_user_config mirror http://http.debian.net/debian/ "Debian mirror"
+ hydra_user_config mirror https://deb.debian.org/debian/ "Debian mirror"
}
# Load configuration
@@ -46,7 +46,7 @@ for req in debootstrap qemu-user-static; do
done
hydra_sudo_run mkdir -p /var/chroot
-hydra_sudo_run debootstrap --variant=minbase --arch $arch $version $WORK $mirror
+hydra_sudo_run debootstrap --force-check-gpg --variant=minbase --arch $arch $version $WORK $mirror
# Apt
if [ "$version" != "sid" ]; then
diff --git a/share/hydractl/provision-raspi b/share/hydractl/provision-raspi
index a54422c..1acb280 100755
--- a/share/hydractl/provision-raspi
+++ b/share/hydractl/provision-raspi
@@ -28,7 +28,7 @@ function hydra_provision_config {
hydra_user_config domain example.org "Domain"
hydra_user_config arch armel "System arch"
hydra_user_config version stretch "Distro version"
- hydra_user_config mirror http://http.debian.net/debian/ "Debian mirror"
+ hydra_user_config mirror https://deb.debian.org/debian/ "Debian mirror"
# Check arch
if [ "$arch" != "armel" ] && [ "$arch" != "armhf" ]; then
@@ -67,7 +67,7 @@ hydra_sudo_run mkfs.ext4 "$device"p2
hydra_sudo_run mount "$device"p2 $WORK
# Bootstrap the system
-hydra_sudo_run debootstrap --foreign --arch=$arch $version $WORK $mirror
+hydra_sudo_run debootstrap --force-check-gpg --foreign --arch=$arch $version $WORK $mirror
hydra_sudo_run cp /usr/bin/qemu-arm-static $WORK/usr/bin/
$CHROOT /debootstrap/debootstrap --second-stage