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-07-16 05:18:57 +02:00
parent 1373be1bc8
commit 7feea11f6d
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
arch-install
View file

@ -60,7 +60,7 @@ function minimalinstallation() {
cp /opt/${repo}/aurinstall.sh ${mountpoint}/usr/bin/aurinstaller cp /opt/${repo}/aurinstall.sh ${mountpoint}/usr/bin/aurinstaller
chmod +x ${mountpoint}/usr/bin/aurinstaller chmod +x ${mountpoint}/usr/bin/aurinstaller
if [ "y" != "noinstall" ]; then if [ "y" != "${noinstall}" ]; then
echo "${name}´s_PC-${version}" > ${mountpoint}/etc/hostname echo "${name}´s_PC-${version}" > ${mountpoint}/etc/hostname
fi fi
@ -287,14 +287,14 @@ function installation {
#boot #boot
echo "format" echo "format"
if [ "y" != "noinstall" ] && [ "${skipbootpartition}" != "y" ]; then if [ "y" != "${noinstall}" ] && [ "${skipbootpartition}" != "y" ]; then
mkfs.vfat -F 32 ${device}${efipartitionnummer} mkfs.vfat -F 32 ${device}${efipartitionnummer}
fi fi
#root #root
if [ "${dateisystem}" == "btrfs" ]; then if [ "${dateisystem}" == "btrfs" ]; then
#mkfs.btrfs -f -L p_arch ${device}2 #mkfs.btrfs -f -L p_arch ${device}2
if [ "y" != "noinstall" ]; then if [ "y" != "${noinstall}" ]; then
btrfsformat #btrfs btrfsformat #btrfs
fi fi
subvolume #btrfs subvolume #btrfs
@ -302,12 +302,12 @@ function installation {
elif [ "${dateisystem}" == "ext4" ]; then elif [ "${dateisystem}" == "ext4" ]; then
echo "confirm with y" echo "confirm with y"
if [ "${verschluesselung}" == "y" ]; then if [ "${verschluesselung}" == "y" ]; then
if [ "y" != "noinstall" ]; then if [ "y" != "${noinstall}" ]; then
mkfs.ext4 -L p_arch ${deviceluks} #ext4 mkfs.ext4 -L p_arch ${deviceluks} #ext4
fi fi
mount ${deviceluks} ${mountpoint} mount ${deviceluks} ${mountpoint}
else else
if [ "y" != "noinstall" ]; then if [ "y" != "${noinstall}" ]; then
mkfs.ext4 -L p_arch ${device}${rootpartitionnummer} #ext4 mkfs.ext4 -L p_arch ${device}${rootpartitionnummer} #ext4
fi fi
mount ${device}${rootpartitionnummer} ${mountpoint} mount ${device}${rootpartitionnummer} ${mountpoint}
@ -317,14 +317,14 @@ function installation {
fi fi
#swap #swap
if [ "y" != "noinstall" ]; then if [ "y" != "${noinstall}" ]; then
if [ "${swap}" != "n" ]; then if [ "${swap}" != "n" ]; then
mkswap -L p_swap ${device}${swappartitionnummer} mkswap -L p_swap ${device}${swappartitionnummer}
fi fi
fi fi
#installation #installation
if [ "y" != "noinstall" ]; then if [ "y" != "${noinstall}" ]; then
if [ "${offline}" != "n" ] if [ "${offline}" != "n" ]
then then
if [ -f /run/archiso/bootmnt/arch/$(uname -m)/airootfs.sfs ]; then if [ -f /run/archiso/bootmnt/arch/$(uname -m)/airootfs.sfs ]; then
@ -443,7 +443,7 @@ function installation {
fi fi
#makeswapfile+fstab #makeswapfile+fstab
if [ "y" != "noinstall" ]; then if [ "y" != "${noinstall}" ]; then
if [ "${swapfile}" == "y" ]; then if [ "${swapfile}" == "y" ]; then
if [ "${dateisystem}" == "btrfs" ]; then if [ "${dateisystem}" == "btrfs" ]; then
makebtrfsswapfile makebtrfsswapfile
@ -453,18 +453,18 @@ function installation {
fi fi
fi fi
if [ "y" != "noinstall" ]; then if [ "y" != "${noinstall}" ]; then
#hostname #hostname
echo "${name}´s_PC-${version}" > ${mountpoint}/etc/hostname echo "${name}´s_PC-${version}" > ${mountpoint}/etc/hostname
fi fi
if [ "y" != "noinstall" ]; then if [ "y" != "${noinstall}" ]; then
if [ "${usbsecret}" == "y" ]; then if [ "${usbsecret}" == "y" ]; then
usbsecret usbsecret
fi fi
fi fi
if [ "y" != "noinstall" ]; then if [ "y" != "${noinstall}" ]; then
if [ "${usbkey}" == "y" ]; then if [ "${usbkey}" == "y" ]; then
usbkeyinstallation usbkeyinstallation
fi fi
@ -675,7 +675,7 @@ function subvolume() {
btrfsmount 1 btrfsmount 1
# Create # Create
if [ "y" != "noinstall" ]; then if [ "y" != "${noinstall}" ]; then
mkdir -p /mnt/btrfs-root/__snapshot mkdir -p /mnt/btrfs-root/__snapshot
mkdir -p /mnt/btrfs-root/__current mkdir -p /mnt/btrfs-root/__current
btrfs subvolume create /mnt/btrfs-root/__current/ROOT btrfs subvolume create /mnt/btrfs-root/__current/ROOT
@ -1116,7 +1116,7 @@ abfrage
secureumount secureumount
if [ "y" == "debug" ] || [ "y" == "noinstall" ] if [ "y" == "${debug}" ] || [ "y" == "${noinstall}" ]
then then
echo "DEBEUG-MODUS" echo "DEBEUG-MODUS"
echo "If no more commands are required, simply press enter" echo "If no more commands are required, simply press enter"
@ -1134,7 +1134,7 @@ fi
# #
echo "A purge stops the chance of installing on the system." echo "A purge stops the chance of installing on the system."
echo "It may take a while!" echo "It may take a while!"
if [ "y" != "noinstall" ]; then if [ "y" != "${noinstall}" ]; then
dd if=/dev/zero of=${device} bs=64M count=10 status=progress dd if=/dev/zero of=${device} bs=64M count=10 status=progress
fi fi
# #
@ -1142,7 +1142,7 @@ if [ "${Partition}" == "uefi" ]
then then
echo "Partitions with UEFI" echo "Partitions with UEFI"
if [ "y" != "noinstall" ]; then if [ "y" != "${noinstall}" ]; then
if [ "${skipbootpartition}" == "y" ] && [ "${swap}" != "n" ]; then if [ "${skipbootpartition}" == "y" ] && [ "${swap}" != "n" ]; then
partitioniereonepartitionmitswap partitioniereonepartitionmitswap
elif [ "${skipbootpartition}" == "y" ]; then elif [ "${skipbootpartition}" == "y" ]; then
@ -1180,7 +1180,7 @@ then
echo "Finished" echo "Finished"
elif [ "${Partition}" == "bios" ]; then elif [ "${Partition}" == "bios" ]; then
echo "Partitions with MBR" echo "Partitions with MBR"
if [ "y" != "noinstall" ]; then if [ "y" != "${noinstall}" ]; then
if [ "${skipbootpartition}" == "y" ] && [ "${swap}" != "n" ]; then if [ "${skipbootpartition}" == "y" ] && [ "${swap}" != "n" ]; then
partitioniereonepartitionmitswap partitioniereonepartitionmitswap
elif [ "${skipbootpartition}" == "y" ]; then elif [ "${skipbootpartition}" == "y" ]; then
@ -1225,7 +1225,7 @@ fi
# benutzerwechsel # benutzerwechsel
if [ "y" != "noinstall" ] && [ -z "${installationsfehler}" ]; then if [ "y" != "${noinstall}" ] && [ -z "${installationsfehler}" ]; then
#arch-chroot ${mountpoint} usermod -l "${name}" user1 #arch-chroot ${mountpoint} usermod -l "${name}" user1
#arch-chroot ${mountpoint} usermod -d /home/"${name}" -m "${name}" #arch-chroot ${mountpoint} usermod -d /home/"${name}" -m "${name}"
arch-chroot ${mountpoint} chfn -f "${name}" user1 arch-chroot ${mountpoint} chfn -f "${name}" user1