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

Merge branch 'master' of https://github.com/simono41/SpectreOS

Browse source
This commit is contained in:
simono41 2018-05-26 03:07:32 +02:00
commit 96816bb480
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch-install
View file

@ -1155,15 +1155,15 @@ if [ "${name}" != "noinstall" ] && [ -z "${installationsfehler}" ] && [ "${offli
arch-chroot ${mountpoint} chfn -f "${name}" user1 arch-chroot ${mountpoint} chfn -f "${name}" user1
arch-chroot ${mountpoint} passwd user1 arch-chroot ${mountpoint} passwd user1
if [ "${autostart}" != "n" ]; then
if [ -f /usr/bin/lightdm ]; then if [ -f /usr/bin/lightdm ]; then
mkdir -p ${mountpoint}/etc/lightdm/ mkdir -p ${mountpoint}/etc/lightdm/
cp /opt/${repo}/Xsession /opt/${repo}/keys.conf /opt/${repo}/lightdm-gtk-greeter.conf /opt/${repo}/lightdm.conf /opt/${repo}/users.conf ${mountpoint}/etc/lightdm/ cp /opt/${repo}/Xsession /opt/${repo}/keys.conf /opt/${repo}/lightdm-gtk-greeter.conf /opt/${repo}/lightdm.conf /opt/${repo}/users.conf ${mountpoint}/etc/lightdm/
if [ "${autostart}" == "n" ]; then
arch-chroot ${mountpoint} systemctl enable lightdm-plymouth.service arch-chroot ${mountpoint} systemctl enable lightdm-plymouth.service
fi
else else
echo "lightdm nicht vorhanden!!!" echo "lightdm nicht vorhanden!!!"
fi fi
fi
arch-chroot ${mountpoint} systemctl enable rc-local-shutdown.service arch-chroot ${mountpoint} systemctl enable rc-local-shutdown.service

3
make_mksquashfs-auto.sh
View file

@ -49,6 +49,7 @@ if [ "${version}" == "libre" ]; then
fi fi
function minimalinstallation() { function minimalinstallation() {
pacman -Syu $(cat base.txt) --needed --noconfirm
cp mirrorlist* /etc/pacman.d/ cp mirrorlist* /etc/pacman.d/
if [ "${deletecache}" == "y" ]; then if [ "${deletecache}" == "y" ]; then
@ -169,7 +170,7 @@ function IMAGE() {
mkdir -p ${work_dir}/iso/${install_dir}/${arch}/airootfs/ mkdir -p ${work_dir}/iso/${install_dir}/${arch}/airootfs/
arch-chroot ${work_dir}/${arch}/airootfs /bin/bash <<EOT ./arch-chroot ${work_dir}/${arch}/airootfs /bin/bash <<EOT
pacman -Scc pacman -Scc
j j
j j