Merge branch 'master' of https://github.com/simono41/SpectreOS
This commit is contained in:
commit
96816bb480
2 changed files with 8 additions and 7 deletions
12
arch-install
12
arch-install
|
@ -1155,14 +1155,14 @@ if [ "${name}" != "noinstall" ] && [ -z "${installationsfehler}" ] && [ "${offli
|
|||
arch-chroot ${mountpoint} chfn -f "${name}" user1
|
||||
arch-chroot ${mountpoint} passwd user1
|
||||
|
||||
if [ "${autostart}" != "n" ]; then
|
||||
if [ -f /usr/bin/lightdm ]; then
|
||||
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/
|
||||
if [ -f /usr/bin/lightdm ]; then
|
||||
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/
|
||||
if [ "${autostart}" == "n" ]; then
|
||||
arch-chroot ${mountpoint} systemctl enable lightdm-plymouth.service
|
||||
else
|
||||
echo "lightdm nicht vorhanden!!!"
|
||||
fi
|
||||
else
|
||||
echo "lightdm nicht vorhanden!!!"
|
||||
fi
|
||||
|
||||
arch-chroot ${mountpoint} systemctl enable rc-local-shutdown.service
|
||||
|
|
|
@ -49,6 +49,7 @@ if [ "${version}" == "libre" ]; then
|
|||
fi
|
||||
|
||||
function minimalinstallation() {
|
||||
pacman -Syu $(cat base.txt) --needed --noconfirm
|
||||
cp mirrorlist* /etc/pacman.d/
|
||||
|
||||
if [ "${deletecache}" == "y" ]; then
|
||||
|
@ -169,7 +170,7 @@ function IMAGE() {
|
|||
|
||||
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
|
||||
j
|
||||
j
|
||||
|
|
Loading…
Reference in a new issue