Merge branch 'master' of ssh://5.83.162.84:22/home/git/SpectreOS

This commit is contained in:
simono41 2018-07-17 15:16:54 +02:00
commit 2be83492b3
2 changed files with 17 additions and 9 deletions

View file

@ -198,15 +198,19 @@ function userrechte() {
chown -cR -v "$username":users /home/"$username" chown -cR -v "$username":users /home/"$username"
chmod 750 -Rv /home/"$username" chmod 750 -Rv /home/"$username"
#ssh #ssh
if [ -d /home/"$username"/.ssh ]; then if ! [ -d /home/"$username"/.ssh ]; then
chmod 700 /home/"$username"/.ssh mkdir -p /home/"$username"/.ssh
fi fi
chmod 700 /home/"$username"/.ssh
if [ -f /home/"$username"/.ssh/id_rsa ]; then if [ -f /home/"$username"/.ssh/id_rsa ]; then
chmod 600 /home/"$username"/.ssh/id_rsa chmod 600 /home/"$username"/.ssh/id_rsa
fi fi
if [ -f /home/"$username"/.ssh/authorized_keys ]; then
chmod 600 /home/"$username"/.ssh/authorized_keys if ! [ -f /home/"$username"/.ssh/authorized_keys ]; then
touch /home/"$username"/.ssh/authorized_keys
fi fi
chmod 600 /home/"$username"/.ssh/authorized_keys
} }
@ -214,15 +218,19 @@ function rootrechte() {
#root #root
chmod 750 -Rv /root chmod 750 -Rv /root
#ssh-root #ssh-root
if [ -d /root/.ssh ]; then if ! [ -d /root/.ssh ]; then
chmod 700 /root/.ssh mkdir -p /root/.ssh
fi fi
chmod 700 /root/.ssh
if [ -f /root/.ssh/id_rsa ]; then if [ -f /root/.ssh/id_rsa ]; then
chmod 600 /root/.ssh/id_rsa chmod 600 /root/.ssh/id_rsa
fi fi
if [ -f /root/.ssh/authorized_key ]; then
chmod 600 /root/.ssh/authorized_keys if ! [ -f /root/.ssh/authorized_key ]; then
touch /root/.ssh/authorized_keys
fi fi
chmod 600 /root/.ssh/authorized_keys
} }

View file

@ -1018,7 +1018,7 @@ function abfrage() {
else else
rootpartitionnummer=${m2ssd}3 rootpartitionnummer=${m2ssd}3
fi fi
elif [ "y" == "dualboot" ]; then if [ "y" == "dualboot" ]; then
bootpartitionnummer=${m2ssd}1 bootpartitionnummer=${m2ssd}1
efipartitionnummer=${m2ssd}2 efipartitionnummer=${m2ssd}2
if [ "${swap}" != "n" ]; then if [ "${swap}" != "n" ]; then