summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--stages/first_stage.sh2
-rw-r--r--util/install_packages.sh2
-rw-r--r--util/reset_pacman_keys.sh26
3 files changed, 1 insertions, 29 deletions
diff --git a/stages/first_stage.sh b/stages/first_stage.sh
index 487bb0d..8b9d640 100644
--- a/stages/first_stage.sh
+++ b/stages/first_stage.sh
@@ -49,8 +49,6 @@ bash create_filesystems.sh $boot_partition_path $root_partition_path
bash mount_filesystems.sh $root_partition_path
-bash reset_pacman_keys.sh
-
bash install_packages.sh $desktop
bash install_archinstall.sh $REPOSITORY_PATH
diff --git a/util/install_packages.sh b/util/install_packages.sh
index 44fe0b4..f4dfae1 100644
--- a/util/install_packages.sh
+++ b/util/install_packages.sh
@@ -21,7 +21,7 @@
desktop_wanted=$1 # e.g. "yes"
-pacstrap /mnt base linux linux-firmware dhcpcd nano sudo grub efibootmgr
+pacstrap -G /mnt base linux linux-firmware dhcpcd nano sudo grub efibootmgr
if [ "$desktop_wanted" = "yes" ]; then
pacstrap /mnt xorg lightdm lightdm-gtk-greeter light-locker accountsservice gnome-screensaver xfce4-pulseaudio-plugin network-manager-applet xfce4 mousepad
fi
diff --git a/util/reset_pacman_keys.sh b/util/reset_pacman_keys.sh
deleted file mode 100644
index fc1e754..0000000
--- a/util/reset_pacman_keys.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-
-# archinstall - A minimal Installation Script for Arch Linux
-# Copyright (C) 2019 xengineering
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-
-rm -rf /etc/pacman.d/gnupg
-pacman-key --init
-pacman-key --populate archlinux
-
-
-echo "Resetted pacman keys - OK"