another try
This commit is contained in:
parent
96b11854f7
commit
274f80b3a0
2 changed files with 12 additions and 9 deletions
|
@ -11,7 +11,7 @@ build_iso:
|
|||
stage: build
|
||||
script:
|
||||
- echo "Installing artools"
|
||||
- pacman --noconfirm -Sy artools iso-profiles
|
||||
- pacman --noconfirm -Sy artools iso-profiles curl wget
|
||||
- echo "Setting up filesystem for the build"
|
||||
- losetup -d /dev/loop3
|
||||
- dd if=/dev/zero of=/tmp/loopfs.img bs=1024 count=8000000
|
||||
|
@ -34,7 +34,7 @@ build_iso:
|
|||
- mv out/*.iso out/ParchLinux-$Desktop-latest.iso
|
||||
artifacts:
|
||||
paths:
|
||||
- out/ParchLinux-$Desktop-latest.iso
|
||||
- ~/artools-workspace/ParchLinux-$Desktop-latest.iso
|
||||
rules:
|
||||
- if: $CI_COMMIT_TAG
|
||||
services:
|
||||
|
@ -52,7 +52,7 @@ deploy_iso:
|
|||
- echo "Creating new directory on remote host"
|
||||
- sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT mkdir -p /srv/http/$Desktop/
|
||||
- echo "Uploading new ISO via rsync"
|
||||
- sshpass -p "$PASS" rsync -r out/ParchLinux-$Desktop-latest.iso parch@$SSH_ROOT:/srv/http/$Desktop/
|
||||
- sshpass -p "$PASS" rsync -r ~/artools-workspace/ParchLinux-$Desktop-latest.iso parch@$SSH_ROOT:/srv/http/$Desktop/
|
||||
rules:
|
||||
- if: $CI_COMMIT_TAG
|
||||
|
||||
|
|
|
@ -21,6 +21,11 @@ update_db() {
|
|||
pacman --noconfirm -Syy
|
||||
}
|
||||
|
||||
update_pacman() {
|
||||
rm -rf /etc/pacman.conf
|
||||
curl https://git.parchlinux.com/iso/team/parch-runit/-/raw/main/config/pacman.conf?ref_type=heads >> /etc/pacman.conf
|
||||
curl https://git.parchlinux.com/iso/team/parch-runit/-/raw/main/config/parch-mirrors?ref_type=heads >> /etc/pacman.d/parch-mirrors
|
||||
}
|
||||
|
||||
replace_getty_args() {
|
||||
local file="/etc/runit/runsvdir/default/agetty-tty1/conf"
|
||||
|
@ -43,7 +48,7 @@ remove_user_files() {
|
|||
exit 1
|
||||
fi
|
||||
|
||||
local users=("artix" "metis")
|
||||
local users=("artix" "liveuser")
|
||||
|
||||
for user in "${users[@]}"; do
|
||||
local user_home=$(eval echo ~$user)
|
||||
|
@ -87,7 +92,7 @@ manage_users() {
|
|||
fi
|
||||
echo "Root user's default shell successfully changed to $shell."
|
||||
|
||||
local password="metis"
|
||||
local password="parch"
|
||||
echo "Setting password for root user to '$password'"
|
||||
echo "root:$password" | chpasswd
|
||||
if [ $? -ne 0 ]; then
|
||||
|
@ -113,9 +118,7 @@ rank_and_replace_mirrorlist() {
|
|||
fi
|
||||
}
|
||||
|
||||
install_grub(){
|
||||
pacman --noconfirm -Rcns artix-grub-live && pacman --noconfirm -S metis-grub-live || echo "Couldn't install grub".
|
||||
}
|
||||
|
||||
|
||||
# execute
|
||||
#make_tty
|
||||
|
@ -127,7 +130,7 @@ make_grub(){
|
|||
}
|
||||
|
||||
#make_grub
|
||||
|
||||
update_pacman
|
||||
update_db
|
||||
rank_and_replace_mirrorlist
|
||||
remove_artix
|
||||
|
|
Loading…
Add table
Reference in a new issue