From 5d8bfab624ced33a8976c58d6d540d8454e0658c Mon Sep 17 00:00:00 2001 From: langfingaz Date: Tue, 4 May 2021 21:01:22 +0200 Subject: [PATCH] interactive pacstrap --- pkg/de-p1st-installer/de-p1st-installer.sh | 8 +++++++- pkg/de-p1st-installer/installer.cfg | 2 ++ pkg/de-p1st-kernel-default/PKGBUILD | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkg/de-p1st-installer/de-p1st-installer.sh b/pkg/de-p1st-installer/de-p1st-installer.sh index cdb29c2..1fa4d76 100755 --- a/pkg/de-p1st-installer/de-p1st-installer.sh +++ b/pkg/de-p1st-installer/de-p1st-installer.sh @@ -208,7 +208,13 @@ function run_pacstrap() { ;; esac - sudo pacstrap /mnt "${PKGS[@]}" || return $? + local args=() + if [ "${PACSTRAP_INTERACTIVE}" = "1" ]; then + args+=('-i') # run interactively + fi + args+=('/mnt') + + sudo pacstrap "${args[@]}" "${PKGS[@]}" || return $? } function run_genfstab() { diff --git a/pkg/de-p1st-installer/installer.cfg b/pkg/de-p1st-installer/installer.cfg index 5aa7b70..77df936 100644 --- a/pkg/de-p1st-installer/installer.cfg +++ b/pkg/de-p1st-installer/installer.cfg @@ -28,3 +28,5 @@ BIOS_TYPE=uefi # If set to "1", then the data, boot and luks partitions # will be left mounted/opened after installation LEAVE_MOUNTED=1 + +PACSTRAP_INTERACTIVE=1 \ No newline at end of file diff --git a/pkg/de-p1st-kernel-default/PKGBUILD b/pkg/de-p1st-kernel-default/PKGBUILD index 9385c5a..835602b 100644 --- a/pkg/de-p1st-kernel-default/PKGBUILD +++ b/pkg/de-p1st-kernel-default/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer: Daniel Langbein -_pkgname=de-p1st-kernel-default +_pkgname=kernel-default _reponame=arch pkgname="de-p1st-$_pkgname" pkgver=0.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="The Linux kernel, modules and headers" arch=('any') url="https://codeberg.org/privacy1st/${_reponame}"