simono41/SpectreOS-old
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove_this

Browse source
This commit is contained in:
simono41 2018-06-14 13:30:42 +02:00
parent 591d94db12
commit a27603875a
1 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
arch-install
View file

@ -61,7 +61,7 @@ function minimalinstallation() {
chmod +x ${mountpoint}/usr/bin/aurinstaller chmod +x ${mountpoint}/usr/bin/aurinstaller
if [ "${name}" != "noinstall" ]; then if [ "${name}" != "noinstall" ]; then
echo "${name}´s_PC-${version}" > ${mountpoint}/etc/hostname echo "${name}´s_PC-${version}" > ${mountpoint}/etc/hostname
fi fi
arch-chroot ${mountpoint} arch-graphical-install-auto adduser user1 user1 arch-chroot ${mountpoint} arch-graphical-install-auto adduser user1 user1
@ -177,7 +177,7 @@ function usbkeyinstallation() {
mkdir -p /mnt/usb-stick mkdir -p /mnt/usb-stick
mount ${usbkeydevice} /mnt/usb-stick mount ${usbkeydevice} /mnt/usb-stick
if ! [ -f "/mnt/usb-stick/archkey" ]; then if ! [ -f "/mnt/usb-stick/archkey" ]; then
dd if=/dev/urandom of=/mnt/usb-stick/archkey bs=512 count=4 dd if=/dev/urandom of=/mnt/usb-stick/archkey bs=512 count=4
fi fi
cryptsetup luksAddKey ${device}${rootpartitionnummer} /mnt/usb-stick/archkey cryptsetup luksAddKey ${device}${rootpartitionnummer} /mnt/usb-stick/archkey
@ -440,8 +440,8 @@ function installation {
fi fi
if [ "${name}" != "noinstall" ]; then if [ "${name}" != "noinstall" ]; then
#hostname #hostname
echo "${name}´s_PC-${version}" > ${mountpoint}/etc/hostname echo "${name}´s_PC-${version}" > ${mountpoint}/etc/hostname
fi fi
if [ "${name}" != "noinstall" ]; then if [ "${name}" != "noinstall" ]; then
@ -855,24 +855,18 @@ function abfrage() {
read -p "Do you want to create a swap partition? : [Y/n] " swap read -p "Do you want to create a swap partition? : [Y/n] " swap
read -p "Do you want to create a swapfile? : [y/N] " swapfile read -p "Do you want to create a swapfile? : [y/N] " swapfile
#echo "This attitude can be seen with: " # if [ "${update}" != "n" ]; then
#echo "systemctl enable openvpn-client@client.service activate and with" #
#echo "systemctl disable openvpn-client@client.service deactivate" # echo "WARNING the system is not encrypted !!!"
#echo "The bandwidth is thereby reduced but the security significantly increased" # echo "WARNING The system will not start without the USB stick !!!"
#read -p "Should the connection with a VPN be encrypted? : [Y/n] " openvpn # read -p "Should a USB stick be installed as the key for the system? : [y/N] " usbsecret
# if [ "${usbsecret}" == "y" ]; then
if [ "${update}" != "n" ]; then # read -p "Which USB stick should be selected for the USB-secret key ?: /dev/sdb1 " usbsecretdevice
# [[ -z "${usbsecretdevice}" ]] && device=/dev/sdb1
echo "WARNING the system is not encrypted !!!" # usbsecretdeviceuuid=$(blkid -s PARTUUID -o value ${usbsecretdevice})
echo "WARNING The system will not start without the USB stick !!!" # [[ -z "${usbsecretdeviceuuid}" ]] && mkfs.ext4 ${usbsecretdevice}
read -p "Should a USB stick be installed as the key for the system? : [y/N] " usbsecret # fi
if [ "${usbsecret}" == "y" ]; then # fi
read -p "Which USB stick should be selected for the USB-secret key ?: /dev/sdb1 " usbsecretdevice
[[ -z "${usbsecretdevice}" ]] && device=/dev/sdb1
usbsecretdeviceuuid=$(blkid -s PARTUUID -o value ${usbsecretdevice})
[[ -z "${usbsecretdeviceuuid}" ]] && mkfs.ext4 ${usbsecretdevice}
fi
fi
if [ "${raid}" == "n" ]; then if [ "${raid}" == "n" ]; then
read -p "Should the hard disk be encrypted? : [y/N] " verschluesselung read -p "Should the hard disk be encrypted? : [y/N] " verschluesselung