summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorxengineering <mail2xengineering@protonmail.com>2020-01-06 16:13:31 +0100
committerxengineering <mail2xengineering@protonmail.com>2020-01-06 16:13:31 +0100
commit2e447564dc7dec0dcc1a88f0d48d562db1e6c5e5 (patch)
tree1ca6d31a77ae79fc64eac5393c018a1650ccf409 /util
parent15f23fe0098c0e18d529b2f76e1085eb77cc00e4 (diff)
downloadarchinstall-2e447564dc7dec0dcc1a88f0d48d562db1e6c5e5.tar
archinstall-2e447564dc7dec0dcc1a88f0d48d562db1e6c5e5.tar.zst
archinstall-2e447564dc7dec0dcc1a88f0d48d562db1e6c5e5.zip
Avoid copy of live image keyring to new installation.
Diffstat (limited to 'util')
-rw-r--r--util/install_packages.sh2
-rw-r--r--util/reset_pacman_keys.sh26
2 files changed, 1 insertions, 27 deletions
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"