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-08-21 19:18:50 -04:00
parent 6ec9ae7878
commit 033fb2a628
2 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
make_mksquashfs-auto.sh
View file

@ -143,6 +143,10 @@ function system() {
echo "blacklist nouveau" > ${work_dir}/${arch}/airootfs/etc/modprobe.d/blacklist_nouveau.conf echo "blacklist nouveau" > ${work_dir}/${arch}/airootfs/etc/modprobe.d/blacklist_nouveau.conf
echo "install dell-smbios /bin/false" > ${work_dir}/${arch}/airootfs/etc/modprobe.d/blacklist-dell-smbios.conf echo "install dell-smbios /bin/false" > ${work_dir}/${arch}/airootfs/etc/modprobe.d/blacklist-dell-smbios.conf
if [ "${version}" != "manjaro" ]; then
plymouth=plymouth
fi
if [ "${version}" == "libre" ] || [ "${version}" == "lite" ]; then if [ "${version}" == "libre" ] || [ "${version}" == "lite" ]; then
echo "MODULES=\"nouveau i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf echo "MODULES=\"nouveau i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
echo "HOOKS=\"base udev archiso block filesystems keyboard\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf echo "HOOKS=\"base udev archiso block filesystems keyboard\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
@ -151,7 +155,7 @@ function system() {
else else
echo "MODULES=\"nvidia nvidia_modeset nvidia_uvm nvidia_drm i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf echo "MODULES=\"nvidia nvidia_modeset nvidia_uvm nvidia_drm i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
echo "HOOKS=\"base udev archiso block filesystems keyboard plymouth\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf echo "HOOKS=\"base udev archiso block filesystems keyboard ${plymouth}\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
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

27
update-packages
View file

@ -12,12 +12,29 @@ echo "Als root Angemeldet"
hostname="$(cat /etc/hostname)" hostname="$(cat /etc/hostname)"
[[ -z "${version}" ]] && version="${hostname#*-}" [[ -z "${version}" ]] && version="${hostname#*-}"
WEBADDRESS="ssh://git@5.83.162.84:22/home/git/SpectreOS"
WEBADDRESS1="ssh://git@5.83.162.84:22/home/git/shell-scripte"
repo=SpectreOS repo=SpectreOS
repo1=shell-scripte repo1=shell-scripte
cd /opt/${repo} if [ -d "/opt/${repo}" ]; then
git reset --hard echo "${repo} existiert bereits!!!"
git pull cd /opt/${repo}
git reset --hard
git pull
else
git clone ${WEBADDRESS} /opt/${repo}
fi
if [ -d "/opt/${repo1}" ]; then
echo "${repo1} existiert bereits!!!"
cd /opt/${repo1}
git reset --hard
git pull
else
git clone ${WEBADDRESS1} /opt/${repo1}
fi
cd /
function standartinstallation() { function standartinstallation() {
pacman -Syu $(cat /opt/${repo}/packages_${version}.txt) --needed --noconfirm --ignore linux pacman -Syu $(cat /opt/${repo}/packages_${version}.txt) --needed --noconfirm --ignore linux
@ -25,8 +42,4 @@ function standartinstallation() {
standartinstallation standartinstallation
cd /opt/${repo1}
git reset --hard
git pull
echo "Fertig!!!" echo "Fertig!!!"