simono41/shell-scripte-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
simono41 2017-11-11 01:43:12 +01:00
parent 2acfbbac0b
commit 0dcc286422
1 changed files with 622 additions and 640 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
Simon-OS/arch-install
View file

@ -17,6 +17,38 @@ function minimalinstallation() {
pacstrap -c -d -G -M ${mountpoint} $line
done < /etc/packages_all.txt
}
function secureumount() {
if [ "${dateisystem}" == "btrfs" ]; then
if cat /proc/mounts | grep ${mountpoint} > /dev/null; then
if [ "${Partition}" == "gpt" ]; then
umount ${mountpoint}/boot
fi
btrfs fi df ${mountpoint}
echo "umount!!!"
umount ${mountpoint}/home
umount ${mountpoint}/opt
umount ${mountpoint}/var/cache/pacman/pkg
umount ${mountpoint}/var/lib
# custom-mounts
for wort in ${mountsnaps}
do
umount ${mountpoint}${wort}
done
umount /mnt/btrfs-root
#umount -R /mnt
fi
elif [ "${dateisystem}" == "ext4" ]; then
if cat /proc/mounts | grep ${mountpoint} > /dev/null; then
if [ "${Partition}" == "gpt" ]; then
umount ${mountpoint}/boot
fi
umount ${mountpoint}
fi
fi
}
function partionierenmitswap() {
@ -605,52 +637,46 @@ function abfrage() {
if [ "${dateisystem}" == "btrfs" ]; then
if [ "${Partition}" == "gpt" ]; then
bootpartitionnummer=1
echo "Boot-Partition = ${device}${bootpartitionnummer}"
efipartitionnummer=2
echo "EFI-Partition = ${device}${efipartitionnummer}"
rootpartitionnummer=3
echo "ROOT-Partition = ${device}${rootpartitionnummer}"
if [ "${swap}" != "n" ]; then
swappartitionnummer=4
echo "Swap-Partition = ${device}${swappartitionnummer}"
swappartitionnummer=3
rootpartitionnummer=4
fi
elif [ "${Partition}" == "mbr" ]; then
bootpartitionnummer=1
echo "Boot-Partition = ${device}${bootpartitionnummer}"
efipartitionnummer=2
echo "EFI-Partition = ${device}${efipartitionnummer}"
rootpartitionnummer=3
echo "ROOT-Partition = ${device}${rootpartitionnummer}"
if [ "${swap}" != "n" ]; then
swappartitionnummer=4
echo "Swap-Partition = ${device}${swappartitionnummer}"
swappartitionnummer=3
rootpartitionnummer=4
fi
fi
elif [ "${dateisystem}" == "ext4" ]; then
if [ "${Partition}" == "gpt" ]; then
bootpartitionnummer=1
echo "Boot-Partition = ${device}${bootpartitionnummer}"
efipartitionnummer=2
echo "EFI-Partition = ${device}${efipartitionnummer}"
rootpartitionnummer=3
echo "ROOT-Partition = ${device}${rootpartitionnummer}"
if [ "${swap}" != "n" ]; then
swappartitionnummer=4
echo "Swap-Partition = ${device}${swappartitionnummer}"
swappartitionnummer=3
rootpartitionnummer=4
fi
elif [ "${Partition}" == "mbr" ]; then
bootpartitionnummer=1
echo "Boot-Partition = ${device}${bootpartitionnummer}"
efipartitionnummer=2
echo "EFI-Partition = ${device}${efipartitionnummer}"
rootpartitionnummer=3
echo "ROOT-Partition = ${device}${rootpartitionnummer}"
if [ "${swap}" != "n" ]; then
swappartitionnummer=4
swappartitionnummer=3
rootpartitionnummer=4
fi
fi
fi
echo "Boot-Partition = ${device}${bootpartitionnummer}"
echo "EFI-Partition = ${device}${efipartitionnummer}"
echo "Swap-Partition = ${device}${swappartitionnummer}"
fi
fi
fi
echo "ROOT-Partition = ${device}${rootpartitionnummer}"
#
read -p "Sind alle Angaben Richtig?: [y/N] " sicherheitsabfrage
@ -693,39 +719,12 @@ then
exit 0
fi
fi
fi
# debug = Installation überspringen zu arch-graphical-install und DEBEUG-MODUS
abfrage
if [ "${name}" != "debug" ]
then
#
if cat /proc/mounts | grep ${device}1 > /dev/null; then
echo "gemountet"
umount ${device}1
else
echo "nicht gemountet"
fi
#
if cat /proc/mounts | grep ${device}2 > /dev/null; then
echo "gemountet"
umount ${device}2
else
echo "nicht gemountet"
fi
#
if cat /proc/mounts | grep ${device}3 > /dev/null; then
echo "gemountet"
umount ${device}2
else
echo "nicht gemountet"
fi
#
if cat /proc/mounts | grep /mnt > /dev/null; then
echo "gemountet"
umount -R /mnt
else
echo "nicht gemountet"
secureumount
fi
#
@ -814,27 +813,10 @@ fi
echo "df!!!"
df -h ${mountpoint}
if [ "${dateisystem}" == "btrfs" ]; then
btrfs fi df ${mountpoint}
btrfs filesystem df ${mountpoint}
fi
echo "umount!!!"
umount ${mountpoint}/home
umount ${mountpoint}/opt
umount ${mountpoint}/var/cache/pacman/pkg
umount ${mountpoint}/var/lib
# custom-mounts
for wort in ${mountsnaps}
do
umount ${mountpoint}${wort}
done
if [ "${Partition}" == "gpt" ]; then
umount ${mountpoint}/boot
fi
umount /mnt/btrfs-root
#umount -R /mnt
else
umount ${mountpoint}
fi
secureumount
echo ""
echo "Fertig!!!"
read -p "Installation erfolgreich Abgeschlossen. Wollen sie den PC NEUSTARTEN?: [Y/n] " sicherheitsabfrage