iso/parch-runit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

another try

Browse source
This commit is contained in:
Sohrab Behdani 2024-09-28 16:21:55 +03:30
parent 96b11854f7
commit 274f80b3a0
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -11,7 +11,7 @@ build_iso:
stage: build stage: build
script: script:
- echo "Installing artools" - echo "Installing artools"
- pacman --noconfirm -Sy artools iso-profiles - pacman --noconfirm -Sy artools iso-profiles curl wget
- echo "Setting up filesystem for the build" - echo "Setting up filesystem for the build"
- losetup -d /dev/loop3 - losetup -d /dev/loop3
- dd if=/dev/zero of=/tmp/loopfs.img bs=1024 count=8000000 - 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 - mv out/*.iso out/ParchLinux-$Desktop-latest.iso
artifacts: artifacts:
paths: paths:
- out/ParchLinux-$Desktop-latest.iso - ~/artools-workspace/ParchLinux-$Desktop-latest.iso
rules: rules:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
services: services:
@ -52,7 +52,7 @@ deploy_iso:
- echo "Creating new directory on remote host" - echo "Creating new directory on remote host"
- sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT mkdir -p /srv/http/$Desktop/ - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT mkdir -p /srv/http/$Desktop/
- echo "Uploading new ISO via rsync" - 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: rules:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG

15
base/root-overlay/root/customize_chroot.sh
View file

@ -21,6 +21,11 @@ update_db() {
pacman --noconfirm -Syy 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() { replace_getty_args() {
local file="/etc/runit/runsvdir/default/agetty-tty1/conf" local file="/etc/runit/runsvdir/default/agetty-tty1/conf"
@ -43,7 +48,7 @@ remove_user_files() {
exit 1 exit 1
fi fi
local users=("artix" "metis") local users=("artix" "liveuser")
for user in "${users[@]}"; do for user in "${users[@]}"; do
local user_home=$(eval echo ~$user) local user_home=$(eval echo ~$user)
@ -87,7 +92,7 @@ manage_users() {
fi fi
echo "Root user's default shell successfully changed to $shell." 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 "Setting password for root user to '$password'"
echo "root:$password" | chpasswd echo "root:$password" | chpasswd
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -113,9 +118,7 @@ rank_and_replace_mirrorlist() {
fi fi
} }
install_grub(){
pacman --noconfirm -Rcns artix-grub-live && pacman --noconfirm -S metis-grub-live || echo "Couldn't install grub".
}
# execute # execute
#make_tty #make_tty
@ -127,7 +130,7 @@ make_grub(){
} }
#make_grub #make_grub
update_pacman
update_db update_db
rank_and_replace_mirrorlist rank_and_replace_mirrorlist
remove_artix remove_artix