Skip to content

Commit a6ab7cd

Browse files
committed
Adapt ALEZ for 'base' package changes
1 parent 71aa2c8 commit a6ab7cd

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

Dockerfile

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ RUN sed -i '/^\[core\]/i [archzfs]\n\
2323
Server = http://archzfs.com/$repo/x86_64\n' \
2424
"${ALEZ_BUILD_DIR}/iso/pacman.conf"
2525

26-
RUN printf 'git\narchzfs-linux\nreflector\nwget\n' >> "${ALEZ_BUILD_DIR}/iso/packages.x86_64"
26+
RUN printf 'git\narchzfs-linux\nreflector\nwget\nlinux\nlinux-firmware\ndhcpcd\nless\nmdadm' >> \
27+
"${ALEZ_BUILD_DIR}/iso/packages.x86_64"
28+
29+
RUN printf '\nsystemctl enable dhcpcd' >> \
30+
"${ALEZ_BUILD_DIR}/iso/airootfs/root/customize_airootfs.sh"
2731

2832
COPY motd "${ALEZ_BUILD_DIR}/iso/airootfs/etc/"
2933

alez.sh

+8-3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ WIDTH=0
3131

3232
show_path=false
3333

34+
declare -a base_packages
35+
base_packages=(
36+
'base' 'nano' 'linux-firmware' 'man-db' 'man-pages' 'vi' 'less'
37+
)
38+
3439
declare -a zpool_bios_features
3540
zpool_bios_features=(
3641
'feature@lz4_compress=enabled'
@@ -245,10 +250,10 @@ install_arch(){
245250
echo "Installing Arch base system..."
246251
{
247252
if [[ "${kernel_type}" =~ ^(l|L)$ ]]; then
248-
pacman -Sg base | cut -d ' ' -f 2 | sed 's/^linux$/linux-lts/g' | \
249-
pacstrap "${installdir}" - linux-lts-headers
253+
pacstrap "${installdir}" linux-lts-headers linux-lts \
254+
"${base_packages[@]}"
250255
else
251-
pacstrap "${installdir}" base linux-headers
256+
pacstrap "${installdir}" linux-headers linux "${base_packages[@]}"
252257
fi
253258
} 2> /dev/null
254259

0 commit comments

Comments
 (0)