Compare commits

..

No commits in common. "arch" and "master" have entirely different histories.
arch ... master

3 changed files with 7 additions and 7 deletions

View file

@ -26,7 +26,7 @@
"value": 512 "value": 512
}, },
"unit": "MiB", "unit": "MiB",
"value": 500 "value": 203
}, },
"start": { "start": {
"sector_size": { "sector_size": {
@ -61,7 +61,7 @@
"value": 512 "value": 512
}, },
"unit": "B", "unit": "B",
"value": 527433728 "value": 216006656
}, },
"status": "create", "status": "create",
"type": "primary" "type": "primary"

View file

@ -106,7 +106,7 @@ users:
sleep 60 sleep 60
sed "s/REPLACE_HOSTNAME/${lname}.actcur.com/g" ../base_files/user_configuration.json > /tmp/user_configuration.json sed "s/REPLACE_HOSTNAME/${lname}.actcur.com/g" ../base_files/user_configuration.json > /tmp/user_configuration.json
rs=$((root_disk*1024-503)) rs=$((root_disk*1024-206))
sed -i "s/REPLACE_SIZE/${rs}/g" /tmp/user_configuration.json sed -i "s/REPLACE_SIZE/${rs}/g" /tmp/user_configuration.json
ssh-keygen -R ${lname}.actcur.com ssh-keygen -R ${lname}.actcur.com
@ -115,8 +115,8 @@ users:
scp -i $ssh_key_dir/id_arch_builder /tmp/user_configuration.json ${lname}.actcur.com:/tmp/user_configuration.json scp -i $ssh_key_dir/id_arch_builder /tmp/user_configuration.json ${lname}.actcur.com:/tmp/user_configuration.json
ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "systemctl mask reflector.service; echo 'Server = https://pkg.actcur.com/repo/archlinux/\$repo/os/\$arch' > /etc/pacman.d/mirrorlist" ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "systemctl mask reflector.service; echo 'Server = https://pkg.actcur.com/repo/archlinux/\$repo/os/\$arch' > /etc/pacman.d/mirrorlist"
ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "archinstall --config /tmp/user_configuration.json --silent" ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "archinstall --config /tmp/user_configuration.json --silent"
ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "ln -s /usr/lib/systemd/system/sshd.service /mnt/etc/systemd/system/multi-user.target.wants/sshd.service" ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "ln -s /usr/lib/systemd/system/sshd.service /mnt/archinstall/etc/systemd/system/multi-user.target.wants/sshd.service"
ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "cp -r /root/.ssh/ /mnt/root/;reboot" ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "cp -r /root/.ssh/ /mnt/archinstall/root/;reboot"
;; ;;
"alma") "alma")
# set up kickstart file # set up kickstart file
@ -159,7 +159,7 @@ ssh-keyscan ${lname}.actcur.com | grep -v "#" | grep "ssh-ed25519 " >> ~/.ssh/kn
# install some dependencies # install some dependencies
case "$variant" in case "$variant" in
"archlinux") "arch")
ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "pacman -Sy --noconfirm ansible-core git" ssh -i $ssh_key_dir/id_arch_builder ${lname}.actcur.com "pacman -Sy --noconfirm ansible-core git"
;; ;;
"alma") "alma")

View file

@ -15,7 +15,7 @@ case $1 in
#defaults to arch #defaults to arch
latest=`date -d yesterday +"%Y.%m.01"` latest=`date -d yesterday +"%Y.%m.01"`
if [ ! -f /tmp/arch-${latest}.iso ];then if [ ! -f /tmp/arch-${latest}.iso ];then
wget https://mirror.cs.odu.edu/archlinux/iso/${latest}/archlinux-${latest}-x86_64.iso -O /tmp/arch-${latest}.iso wget https://mirror.arizona.edu/archlinux/iso/${latest}/archlinux-${latest}-x86_64.iso -O /tmp/arch-${latest}.iso
fi fi
echo "/tmp/arch-${latest}.iso" echo "/tmp/arch-${latest}.iso"
;; ;;