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-04-25 14:24:36 +02:00
parent d46436c7ba
commit 37fcddb949
1 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
make_mksquashfs-auto.sh
View file

@ -9,7 +9,7 @@ if [[ $EUID -ne 0 ]]; then
fi fi
# full parameters # full parameters
# ./make_mksquashfs-auto.sh xfce4 deletework makesystem mkinitcpio filesystem archchroot makeimage makebios makeiso # ./make_mksquashfs-auto.sh xfce4 deletework makesystem mkinitcpio filesystem makeimage makebios makeiso
iso_name=spectre_os iso_name=spectre_os
iso_label="SPECTRE_OS" iso_label="SPECTRE_OS"
@ -29,7 +29,6 @@ do
if [ "$wort" == "makesystem" ]; then makesystem=y; fi if [ "$wort" == "makesystem" ]; then makesystem=y; fi
if [ "$wort" == "mkinitcpio" ]; then mkinitcpio=y; fi if [ "$wort" == "mkinitcpio" ]; then mkinitcpio=y; fi
if [ "$wort" == "filesystem" ]; then filesystem=y; fi if [ "$wort" == "filesystem" ]; then filesystem=y; fi
if [ "$wort" == "archchroot" ]; then archchroot=y; fi
if [ "$wort" == "makeimage" ]; then makeimage=y; fi if [ "$wort" == "makeimage" ]; then makeimage=y; fi
if [ "$wort" == "makebios" ]; then makebios=y; fi if [ "$wort" == "makebios" ]; then makebios=y; fi
if [ "$wort" == "makeiso" ]; then makeiso=y; fi if [ "$wort" == "makeiso" ]; then makeiso=y; fi
@ -51,22 +50,11 @@ function minimalinstallation() {
cp pacman* /etc/ cp pacman* /etc/
cp mirrorlist* /etc/pacman.d/ cp mirrorlist* /etc/pacman.d/
if [ "${archchroot}" != "y" ]; then
echo "Tipp: Die Option -i eine automatische Bestätigung der Paketauswahl. Da Sie den Linux-Kernel nicht im Container installieren müssen, können Sie ihn aus der Paketlistenauswahl entfernen, um Platz zu sparen. Siehe Pacman # Verwendung ."
fi
if [ "${version}" == "libre" ]; then if [ "${version}" == "libre" ]; then
if [ "${archchroot}" != "y" ]; then
./pacstrap -C pacman.conf_libre -c -i -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt) --ignore linux
else
./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt) ./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt)
fi
else
if [ "${archchroot}" != "y" ]; then
./pacstrap -C pacman.conf -c -i -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore linux
else else
./pacstrap -C pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) ./pacstrap -C pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
fi fi
fi
} }
function secureumount() { function secureumount() {
@ -429,17 +417,15 @@ system
if [ "${filesystem}" == "y" ]; then if [ "${filesystem}" == "y" ]; then
echo "Jetzt können sie ihr Betriebssystem nach ihren Belieben anpassen :D" echo ${hostname} > ${work_dir}/${arch}/airootfs/etc/hostname
echo "Tipp: benutzen sie den User root :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
echo "${hostname}" > ${work_dir}/${arch}/airootfs/etc/hostname chmod +x ${work_dir}/${arch}/airootfs/usr/bin/arch-graphical-install-auto
if [ "${archchroot}" != "y" ]; then ./arch-chroot ${work_dir}/${arch}/airootfs /usr/bin/arch-graphical-install-auto ${version}
echo "ERSTTSTART WIRD JETZT AUSGEFÜHRT"
echo "Der erste Start kann etwas länger dauern!!!"
echo "Bitte loggen sie sich mit root ein und fahren sie wieder mit poweroff runter!!!"
systemd-nspawn -b -D ${work_dir}/${arch}/airootfs systemd-nspawn -b -D ${work_dir}/${arch}/airootfs
else
./arch-chroot ${work_dir}/${arch}/airootfs /usr/bin/arch-graphical-install-auto ${version} user1 user1 archchroot
fi
fi fi
if [ "${makeimage}" == "y" ]; then if [ "${makeimage}" == "y" ]; then