simono41/SpectreOS-old
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
simono41 2018-04-25 11:19:45 +02:00
parent 9c413bdeed
commit 3b3fe5f037
4 changed files with 16 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch-graphical-install-auto
View file

@ -329,7 +329,7 @@ if [ -f /var/lib/pacman/db.lck ];then
fi fi
# vollinstallation # vollinstallation
if [ "$vollinstallation" != "debug" ]; then if [ "$version" != "lite" ]; then
standartinstallation standartinstallation
fi fi

15
base.txt
View file

@ -1,30 +1,45 @@
acpid
arch-install-scripts arch-install-scripts
avahi
base base
base-devel base-devel
bash-completion bash-completion
btrfs-progs btrfs-progs
cdrtools cdrtools
cmake
cronie
cups
davfs2
dbus
dialog dialog
dosfstools dosfstools
efibootmgr efibootmgr
efitools efitools
exfat-utils
fail2ban
fish fish
gdisk gdisk
git git
grub grub
htop htop
intel-ucode
iw iw
links links
mkinitcpio-nfs-utils mkinitcpio-nfs-utils
nbd nbd
networkmanager networkmanager
ntp
openssh openssh
openvpn
os-prober os-prober
pixz pixz
ppp ppp
screen
squashfs-tools squashfs-tools
syslinux syslinux
tar tar
traceroute
ufw
wget wget
wireless_tools wireless_tools
wpa_supplicant wpa_supplicant

8
make_mksquashfs-auto.sh
View file

@ -140,12 +140,6 @@ function system() {
echo "COMPRESSION=\"lz4\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf 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 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 else
#echo "MODULES=\"i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf #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 #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 "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 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 fi
fi fi

43
packages_lite.txt
View file

@ -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