fix
This commit is contained in:
parent
b9dc147e7c
commit
080bee6996
5 changed files with 53 additions and 2 deletions
1
base.txt
1
base.txt
|
@ -1,5 +1,6 @@
|
|||
acpid
|
||||
arch-install-scripts
|
||||
archlinux-keyring
|
||||
avahi
|
||||
base
|
||||
base-devel
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
acpid
|
||||
arch-install-scripts
|
||||
archlinux-keyring
|
||||
avahi
|
||||
base
|
||||
base-devel
|
||||
|
@ -31,6 +32,7 @@ ntp
|
|||
openssh
|
||||
openvpn
|
||||
os-prober
|
||||
parabola-keyring
|
||||
pixz
|
||||
ppp
|
||||
screen
|
||||
|
|
48
base_manjaro.txt
Executable file
48
base_manjaro.txt
Executable file
|
@ -0,0 +1,48 @@
|
|||
acpid
|
||||
arch-install-scripts
|
||||
archlinux-keyring
|
||||
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
|
||||
intel-ucode
|
||||
iw
|
||||
links
|
||||
manjaro-keyring
|
||||
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
|
|
@ -55,7 +55,7 @@ function minimalinstallation() {
|
|||
if [ "${version}" == "libre" ]; then
|
||||
./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt)
|
||||
elif [ "${version}" == "manjaro" ]; then
|
||||
./pacstrap -C pacman.conf_manjaro -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
|
||||
./pacstrap -C pacman.conf_manjaro -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_manjaro.txt)
|
||||
else
|
||||
./pacstrap -C pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
|
||||
fi
|
||||
|
|
|
@ -17,7 +17,7 @@ CacheDir = /var/cache/pacman/pkg/
|
|||
#HookDir = /etc/pacman.d/hooks/
|
||||
HoldPkg = pacman glibc manjaro-system
|
||||
# If upgrades are available for these packages they will be asked for first
|
||||
SyncFirst = manjaro-system archlinux-keyring manjaro-keyring
|
||||
#SyncFirst = manjaro-system archlinux-keyring manjaro-keyring
|
||||
#XferCommand = /usr/bin/curl -C - -f %u > %o
|
||||
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||
#CleanMethod = KeepInstalled
|
||||
|
|
Loading…
Reference in a new issue