fix
This commit is contained in:
parent
e28cfc01a0
commit
60ca38607f
2 changed files with 18 additions and 17 deletions
|
@ -296,6 +296,19 @@ then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# grundinstallation
|
||||||
|
|
||||||
|
gitclone
|
||||||
|
|
||||||
|
if [ "$vollinstallation" != "n" ]
|
||||||
|
then
|
||||||
|
check
|
||||||
|
if [ "$vollinstallation" != "debug" ]; then
|
||||||
|
standartinstallation
|
||||||
|
fi
|
||||||
|
checkend
|
||||||
|
fi
|
||||||
|
|
||||||
# sudoers/wheel
|
# sudoers/wheel
|
||||||
|
|
||||||
echo "Lege $SUDOERS neu an!!!"
|
echo "Lege $SUDOERS neu an!!!"
|
||||||
|
@ -304,8 +317,6 @@ echo "root ALL=(ALL) NOPASSWD: ALL" > $SUDOERS
|
||||||
|
|
||||||
echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> $SUDOERS
|
echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> $SUDOERS
|
||||||
|
|
||||||
gitclone
|
|
||||||
|
|
||||||
# Your commands
|
# Your commands
|
||||||
|
|
||||||
# modprobe.d
|
# modprobe.d
|
||||||
|
@ -344,15 +355,6 @@ if [ -f /var/lib/pacman/db.lck ];then
|
||||||
rm /var/lib/pacman/db.lck
|
rm /var/lib/pacman/db.lck
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$vollinstallation" != "n" ]
|
|
||||||
then
|
|
||||||
check
|
|
||||||
if [ "$vollinstallation" != "debug" ]; then
|
|
||||||
standartinstallation
|
|
||||||
fi
|
|
||||||
checkend
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "${version}" != "libre" ]; then
|
if [ "${version}" != "libre" ]; then
|
||||||
#yaourtmanagerinstall
|
#yaourtmanagerinstall
|
||||||
#pacaurmanagerinstall
|
#pacaurmanagerinstall
|
||||||
|
|
|
@ -35,9 +35,9 @@ function minimalinstallation() {
|
||||||
cp mirrorlist* /etc/pacman.d/
|
cp mirrorlist* /etc/pacman.d/
|
||||||
|
|
||||||
if [ "${version}" == "libre" ]; then
|
if [ "${version}" == "libre" ]; then
|
||||||
./pacstrap -C /etc/pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore linux
|
./pacstrap -C /etc/pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs base git --ignore linux
|
||||||
else
|
else
|
||||||
./pacstrap -C /etc/pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore linux
|
./pacstrap -C /etc/pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs base git --ignore linux
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -393,11 +393,10 @@ if [ "${parameter2}" != "skip" ]; then
|
||||||
filesystem
|
filesystem
|
||||||
|
|
||||||
echo "Jetzt können sie ihr Betriebssystem nach ihren Belieben anpassen:D"
|
echo "Jetzt können sie ihr Betriebssystem nach ihren Belieben anpassen:D"
|
||||||
|
echo "Bitte führen sie arch-graphical-install-auto und die Version aus."
|
||||||
|
echo "Benutze Poweroff um das System wieder herunterzufahren und das Komprimieren zu beginnen :)"
|
||||||
cp arch-graphical-install-auto ${work_dir}/${arch}/airootfs/usr/bin/arch-graphical-install-auto
|
cp arch-graphical-install-auto ${work_dir}/${arch}/airootfs/usr/bin/arch-graphical-install-auto
|
||||||
systemd-nspawn -b -u root -D ${work_dir}/${arch}/airootfs <<EOT
|
systemd-nspawn -b -D ${work_dir}/${arch}/airootfs
|
||||||
/usr/bin/arch-graphical-install-auto ${version}
|
|
||||||
EOT
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${parameter3}" != "skip" ]; then
|
if [ "${parameter3}" != "skip" ]; then
|
||||||
|
|
Loading…
Reference in a new issue