Adapt ALEZ for 'base' package changes

danboid · Oct 17, 2019 · a6ab7cd · a6ab7cd
1 parent 71aa2c8
commit a6ab7cd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -23,7 +23,11 @@ RUN sed -i '/^\[core\]/i [archzfs]\n\
             Server = http://archzfs.com/$repo/x86_64\n' \
     "${ALEZ_BUILD_DIR}/iso/pacman.conf"
 
-RUN printf 'git\narchzfs-linux\nreflector\nwget\n' >> "${ALEZ_BUILD_DIR}/iso/packages.x86_64"
+RUN printf 'git\narchzfs-linux\nreflector\nwget\nlinux\nlinux-firmware\ndhcpcd\nless\nmdadm' >> \
+           "${ALEZ_BUILD_DIR}/iso/packages.x86_64"
+
+RUN printf '\nsystemctl enable dhcpcd' >> \
+           "${ALEZ_BUILD_DIR}/iso/airootfs/root/customize_airootfs.sh"
 
 COPY motd "${ALEZ_BUILD_DIR}/iso/airootfs/etc/"
 

diff --git a/alez.sh b/alez.sh
@@ -31,6 +31,11 @@ WIDTH=0
 
 show_path=false
 
+declare -a base_packages
+base_packages=(
+    'base' 'nano' 'linux-firmware' 'man-db' 'man-pages' 'vi' 'less'
+)
+
 declare -a zpool_bios_features
 zpool_bios_features=(
     'feature@lz4_compress=enabled'
@@ -245,10 +250,10 @@ install_arch(){
     echo "Installing Arch base system..."
     {
         if [[ "${kernel_type}" =~ ^(l|L)$ ]]; then
-            pacman -Sg base | cut -d ' ' -f 2 | sed 's/^linux$/linux-lts/g' | \
-                    pacstrap "${installdir}" - linux-lts-headers
+            pacstrap "${installdir}" linux-lts-headers linux-lts \
+                                     "${base_packages[@]}"
         else
-            pacstrap "${installdir}" base linux-headers
+            pacstrap "${installdir}" linux-headers linux "${base_packages[@]}"
         fi
     } 2> /dev/null