diff --git a/.gitignore b/.gitignore index 18c1c61..208f33e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /pkg/*/arch-pkg/ /pkg/*/*-any.pkg.tar.zst /pkg/*/*-package.log +/archlive/ diff --git a/archiso.sh b/archiso.sh index ba45677..d2cd557 100755 --- a/archiso.sh +++ b/archiso.sh @@ -2,10 +2,14 @@ # # https://wiki.archlinux.org/index.php/Archiso#Prepare_a_custom_profile # -# Arch installer with some additional packages. +# Arch installer with some additional packages: +# -> de-p1st mirror in pacman.conf +# -> german keyboard +# -> git # BUILD_DIR=./archlive PKGS=('git' 'de-p1st-keyboard' 'de-p1st-pacman') +PACMAN_CFG_ADDITION='pkg/de-p1st-pacman/pacman.d/de-p1st' # will be used to extend the builder's pacman.conf ################################ @@ -27,7 +31,7 @@ fi cp -r "$PROFILE" "$BUILD_DIR"/profile || exit # https://wiki.archlinux.org/index.php/Archiso#Custom_local_repository -cat pkg/de-p1st-pacman/pacman.d/de-p1st >> "$BUILD_DIR"/profile/pacman.conf || exit +cat "${PACMAN_CFG_ADDITION}" >> "$BUILD_DIR"/profile/pacman.conf || exit for PKG in "${PKGS[@]}"; do echo "${PKG}" >> "${BUILD_DIR}"/profile/packages.x86_64