fix
This commit is contained in:
parent
b5a890d657
commit
2c302aae17
2 changed files with 49 additions and 4 deletions
45
base_libre.txt
Executable file
45
base_libre.txt
Executable file
|
@ -0,0 +1,45 @@
|
||||||
|
acpid
|
||||||
|
arch-install-scripts
|
||||||
|
avahi
|
||||||
|
base
|
||||||
|
base-devel
|
||||||
|
bash-completion
|
||||||
|
btrfs-progs
|
||||||
|
cdrtools
|
||||||
|
cmake
|
||||||
|
cronie
|
||||||
|
cups
|
||||||
|
davfs2
|
||||||
|
dbus
|
||||||
|
dialog
|
||||||
|
dosfstools
|
||||||
|
efibootmgr
|
||||||
|
efitools
|
||||||
|
exfat-utils
|
||||||
|
fail2ban
|
||||||
|
fish
|
||||||
|
gdisk
|
||||||
|
git
|
||||||
|
grub
|
||||||
|
htop
|
||||||
|
iw
|
||||||
|
links
|
||||||
|
mkinitcpio-nfs-utils
|
||||||
|
nbd
|
||||||
|
networkmanager
|
||||||
|
ntp
|
||||||
|
openssh
|
||||||
|
openvpn
|
||||||
|
os-prober
|
||||||
|
pixz
|
||||||
|
ppp
|
||||||
|
screen
|
||||||
|
squashfs-tools
|
||||||
|
syslinux
|
||||||
|
tar
|
||||||
|
traceroute
|
||||||
|
ufw
|
||||||
|
wget
|
||||||
|
wireless_tools
|
||||||
|
wpa_supplicant
|
||||||
|
xorriso
|
|
@ -56,15 +56,15 @@ function minimalinstallation() {
|
||||||
fi
|
fi
|
||||||
if [ "${version}" == "libre" ]; then
|
if [ "${version}" == "libre" ]; then
|
||||||
if [ "${archchroot}" != "y" ]; then
|
if [ "${archchroot}" != "y" ]; then
|
||||||
./pacstrap -C /etc/pacman.conf_libre -c -i -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore linux,intel-ucode
|
./pacstrap -C pacman.conf_libre -c -i -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt) --ignore linux
|
||||||
else
|
else
|
||||||
./pacstrap -C /etc/pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore intel-ucode
|
./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt)
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if [ "${archchroot}" != "y" ]; then
|
if [ "${archchroot}" != "y" ]; then
|
||||||
./pacstrap -C /etc/pacman.conf -c -i -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore linux
|
./pacstrap -C pacman.conf -c -i -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore linux
|
||||||
else
|
else
|
||||||
./pacstrap -C /etc/pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
|
./pacstrap -C pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue