fix
This commit is contained in:
parent
9c413bdeed
commit
3b3fe5f037
4 changed files with 16 additions and 52 deletions
|
@ -329,7 +329,7 @@ if [ -f /var/lib/pacman/db.lck ];then
|
|||
fi
|
||||
|
||||
# vollinstallation
|
||||
if [ "$vollinstallation" != "debug" ]; then
|
||||
if [ "$version" != "lite" ]; then
|
||||
standartinstallation
|
||||
fi
|
||||
|
||||
|
|
15
base.txt
15
base.txt
|
@ -1,30 +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
|
||||
intel-ucode
|
||||
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
|
||||
|
|
|
@ -140,12 +140,6 @@ function system() {
|
|||
echo "COMPRESSION=\"lz4\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
|
||||
echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
|
||||
|
||||
if [ "${version}" == "libre" ]; then
|
||||
./arch-chroot ${work_dir}/${arch}/airootfs mkinitcpio -p linux-libre
|
||||
else
|
||||
./arch-chroot ${work_dir}/${arch}/airootfs mkinitcpio -p linux
|
||||
fi
|
||||
|
||||
else
|
||||
#echo "MODULES=\"i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
|
||||
#echo "HOOKS=\"base udev plymouth memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
|
||||
|
@ -157,8 +151,6 @@ function system() {
|
|||
echo "COMPRESSION=\"lz4\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
|
||||
echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf /etc/modprobe.d/blacklist_nouveau.conf\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
|
||||
|
||||
./arch-chroot ${work_dir}/${arch}/airootfs mkinitcpio -p linux
|
||||
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
|
@ -1,43 +0,0 @@
|
|||
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
|
||||
intel-ucode
|
||||
iw
|
||||
links
|
||||
ntp
|
||||
openssh
|
||||
openvpn
|
||||
os-prober
|
||||
python
|
||||
python-pip
|
||||
python2-pip
|
||||
screen
|
||||
squashfs-tools
|
||||
syslinux
|
||||
traceroute
|
||||
ufw
|
||||
wget
|
||||
wireless_tools
|
||||
wpa_supplicant
|
||||
xorriso
|
Loading…
Reference in a new issue