From f55c11d6bf5d9277988b4dd311305d699b0bd950 Mon Sep 17 00:00:00 2001 From: Lukas Plevac Date: Sun, 8 Dec 2024 17:48:10 +0100 Subject: [PATCH] Added support for slurm power --- airootfs/installFiles/slurmResume | 5 ---- airootfs/installFiles/slurmSuspend | 5 ---- versions/lite/airootfs/fast_install_stage2.sh | 8 ++++++- .../master/airootfs/fast_install_stage2.sh | 24 +++++++++++++++++-- .../slave/airootfs/fast_install_stage2.sh | 14 ++++++++++- 5 files changed, 42 insertions(+), 14 deletions(-) delete mode 100755 airootfs/installFiles/slurmResume delete mode 100755 airootfs/installFiles/slurmSuspend diff --git a/airootfs/installFiles/slurmResume b/airootfs/installFiles/slurmResume deleted file mode 100755 index 07923b3..0000000 --- a/airootfs/installFiles/slurmResume +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -echo "`date` User $USER invoked Resume $*" >>/var/log/slurm/power_save.log - -sudo etherwake b0:83:fe:d8:a6:e0 diff --git a/airootfs/installFiles/slurmSuspend b/airootfs/installFiles/slurmSuspend deleted file mode 100755 index 8d6d36a..0000000 --- a/airootfs/installFiles/slurmSuspend +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -echo "`date` User $USER invoked Suspend $*" >>/var/log/slurm/power_save.log - -sshpass -p 4126 ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -t lukasplevac@10.0.0.101 "sudo /sbin/shutdown" diff --git a/versions/lite/airootfs/fast_install_stage2.sh b/versions/lite/airootfs/fast_install_stage2.sh index 267c5a7..687e28f 100644 --- a/versions/lite/airootfs/fast_install_stage2.sh +++ b/versions/lite/airootfs/fast_install_stage2.sh @@ -61,10 +61,16 @@ echo "UseDomains=true" >> /etc/systemd/network/20-wired.network echo "Adding Users" -useradd -m -G wheel,users -s /bin/bash ${USER} +groupadd wheel +groupadd sudo + +useradd -m -G users,sudo -s /bin/bash ${USER} yes ${PASSWORD} | passwd yes ${PASSWORD} | passwd ${USER} +echo "%sudo ALL=(ALL:ALL) ALL" >> /etc/sudoers +echo "%wheel ALL=(ALL:ALL) NOPASSWD ALL" >> /etc/sudoers + echo "Installing GRUB" mkdir /boot/grub diff --git a/versions/master/airootfs/fast_install_stage2.sh b/versions/master/airootfs/fast_install_stage2.sh index d16ada6..56456d5 100644 --- a/versions/master/airootfs/fast_install_stage2.sh +++ b/versions/master/airootfs/fast_install_stage2.sh @@ -21,7 +21,7 @@ pacman -Syy pacman -S --noconfirm man-pages man-db dnsutils ethtool iputils net-tools iproute2 openssh wget \ usbutils usb_modeswitch tcpdump smartmontools gnu-netcat mc dosfstools exfat-utils \ partclone parted partimage gptfdisk iw dialog base-devel vim \ -grub os-prober efivar efibootmgr efitools intel-ucode amd-ucode dmidecode htop nano python slurm-llnl nfs-utils saturn-discover lmod python-pipenv +grub os-prober efivar efibootmgr efitools intel-ucode amd-ucode dmidecode htop nano python slurm-llnl nfs-utils saturn-discover lmod python-pipenv saturn-power wol cd /usr/bin/ ln -s vim vi @@ -57,10 +57,24 @@ echo "UseDomains=true" >> /etc/systemd/network/20-wired.network echo "Adding Users" -useradd -m -G wheel,users -s /bin/bash ${USER} +groupadd wheel +groupadd sudo + +useradd -m -G users,sudo -s /bin/bash ${USER} yes ${PASSWORD} | passwd yes ${PASSWORD} | passwd ${USER} +usermod -a -G wheel slurm + +echo "%sudo ALL=(ALL:ALL) ALL" >> /etc/sudoers +echo "%wheel ALL=(ALL:ALL) NOPASSWD ALL" >> /etc/sudoers + +useradd -m -G users,sudo -s /bin/bash maintenance +ssh-keygen -t ed25519 -C "maintenance" -f /root/.ssh/maintenance -N '' + +mkdir /home/maintenance/.ssh +cat /root/.ssh/maintenance.pub >> /home/maintenance/.ssh/authorized_keys + echo "Installing GRUB" mkdir /boot/grub @@ -106,6 +120,12 @@ sudo mkdir /clusterfs sudo chown nobody.nogroup /clusterfs sudo chmod -R 777 /clusterfs +mkdir /clusterfs/config +sudo chown root /clusterfs/config +sudo chmod -R 700 /clusterfs/config + +cp /root/.ssh/maintenance.pub /clusterfs/config/maintenance.pub + # todo security check here echo "/clusterfs (rw,sync,no_root_squash,no_subtree_check)" >> /etc/exports echo "/home (rw,sync,no_root_squash,no_subtree_check)" >> /etc/exports diff --git a/versions/slave/airootfs/fast_install_stage2.sh b/versions/slave/airootfs/fast_install_stage2.sh index 8fb8b02..d96b257 100644 --- a/versions/slave/airootfs/fast_install_stage2.sh +++ b/versions/slave/airootfs/fast_install_stage2.sh @@ -57,10 +57,22 @@ echo "UseDomains=true" >> /etc/systemd/network/20-wired.network echo "Adding Users" -useradd -m -G wheel,users -s /bin/bash ${USER} +groupadd wheel +groupadd sudo + +useradd -m -G users,sudo -s /bin/bash ${USER} yes ${PASSWORD} | passwd yes ${PASSWORD} | passwd ${USER} +usermod -a -G wheel slurm + +echo "%sudo ALL=(ALL:ALL) ALL" >> /etc/sudoers +echo "%wheel ALL=(ALL:ALL) NOPASSWD ALL" >> /etc/sudoers + +useradd -m -G users,sudo -s /bin/bash maintenance + +mkdir /home/maintenance/.ssh + echo "Installing GRUB" mkdir /boot/grub