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

systemd-nspawn -b -D

Browse source
This commit is contained in:
simono41 2018-04-08 18:49:31 +02:00
parent 2f5f5d6a5f
commit e28cfc01a0
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
arch-graphical-install-auto
View file

@ -363,10 +363,24 @@ if [ "${version}" != "libre" ]; then
aurinstall plymouth-theme-dark-arch
plymouth-set-default-theme -R dark-arch
aurinstall snapd
systemctl enable snapd
systemctl enable --now snapd.socket
if ! [ -d "/snap" ];then
ln -s /var/lib/snapd/snap /snap
fi
snap install spotify
ln -s /var/lib/snapd/snap/bin/spotify /usr/bin/spotify
ln -s /var/lib/snapd/desktop/applications/spotify_spotify.desktop /usr/share/applications/spotify_spotify.desktop
if ! [ -f "/usr/bin/spotify" ];then
ln -s /var/lib/snapd/snap/bin/spotify /usr/bin/spotify
fi
if ! [ -f "/usr/share/applications/spotify_spotify.desktop" ];then
ln -s /var/lib/snapd/desktop/applications/spotify_spotify.desktop /usr/share/applications/spotify_spotify.desktop
fi
snap install skype
if ! [ -f "/usr/bin/skype" ];then
ln -s /var/lib/snapd/snap/bin/skype /usr/bin/skype
fi
if ! [ -f "/usr/share/applications/skype_skypeforlinux.desktop" ];then
ln -s /var/lib/snapd/desktop/applications/skype_skypeforlinux.desktop /usr/share/applications/skype_skypeforlinux.desktop
fi
fi

8
make_mksquashfs-auto.sh
View file

@ -35,9 +35,9 @@ function minimalinstallation() {
cp mirrorlist* /etc/pacman.d/
if [ "${version}" == "libre" ]; then
./pacstrap -C /etc/pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
./pacstrap -C /etc/pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore linux
else
./pacstrap -C /etc/pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
./pacstrap -C /etc/pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore linux
fi
}
@ -394,7 +394,9 @@ if [ "${parameter2}" != "skip" ]; then
echo "Jetzt können sie ihr Betriebssystem nach ihren Belieben anpassen:D"
cp arch-graphical-install-auto ${work_dir}/${arch}/airootfs/usr/bin/arch-graphical-install-auto
./arch-chroot ${work_dir}/${arch}/airootfs /usr/bin/arch-graphical-install-auto ${version}
systemd-nspawn -b -u root -D ${work_dir}/${arch}/airootfs <<EOT
/usr/bin/arch-graphical-install-auto ${version}
EOT
fi