From ee4d935f82b1a529ee65b00b59d17253df872ef7 Mon Sep 17 00:00:00 2001 From: sasha0552 Date: Thu, 25 Apr 2024 15:21:08 +0000 Subject: [PATCH] Change CI, fix vLLM on Pascal (#33) * Use GH runner for rocm * Update repositories * Install custom triton with pascal support for vllm * Dedupe after each repo on rocm * Install triton before dependencies * Update .gitignore * Use subdirectory for triton installation * Replace nodm with ly, add power options to openbox * Use latest release instead of latest commit on default branch for some projects * Add update repositories script * Reenable rocm on selfhosted, but manual only * Change summary generation * Remove triton & npm cache * Increase cowspace --- .ci/actions.py | 4 +- .ci/options.ini | 20 +++-- .ci/template/gh-build-iso.yml.jinja2 | 10 ++- .ci/template/sh-build-iso.yml.jinja2 | 44 +++-------- .ci/update.py | 55 ++++++++++--- .github/workflows/gh-build-iso-cuda-empty.yml | 10 ++- .github/workflows/gh-build-iso-cuda-gui.yml | 10 ++- .github/workflows/gh-build-iso-cuda.yml | 10 ++- .github/workflows/gh-build-iso-rocm-empty.yml | 10 ++- .github/workflows/gh-update-repositories.yml | 25 ++++++ .github/workflows/sh-build-iso-rocm-gui.yml | 46 ++++------- .github/workflows/sh-build-iso-rocm.yml | 46 ++++------- .github/workflows/sh-do-nothing.yml | 78 ------------------- .gitignore | 2 +- airootfs/etc/ly/config.ini | 5 ++ airootfs/etc/nodm.conf | 23 ------ airootfs/home/tori/.config/openbox/menu.xml | 16 ++++ airootfs/root/customize_airootfs.sh.jinja2 | 8 +- .../scripts/1000-vllm.sh.jinja2 | 3 + .../scripts/9999-cleanup.sh.jinja2 | 6 ++ efiboot/loader/entries/00-default.conf | 2 +- packages.x86_64.jinja2 | 3 +- syslinux/syslinux.cfg | 2 +- 23 files changed, 203 insertions(+), 235 deletions(-) create mode 100644 .github/workflows/gh-update-repositories.yml delete mode 100644 .github/workflows/sh-do-nothing.yml create mode 100644 airootfs/etc/ly/config.ini delete mode 100644 airootfs/etc/nodm.conf diff --git a/.ci/actions.py b/.ci/actions.py index 649c641..0148863 100755 --- a/.ci/actions.py +++ b/.ci/actions.py @@ -23,9 +23,9 @@ def main(): render_template(f"{i}/gh-build-iso.yml.jinja2", f"{o}/gh-build-iso-cuda.yml" , platform="cuda", type="normal") render_template(f"{i}/gh-build-iso.yml.jinja2", f"{o}/gh-build-iso-cuda-empty.yml", platform="cuda", type="empty") render_template(f"{i}/gh-build-iso.yml.jinja2", f"{o}/gh-build-iso-cuda-gui.yml" , platform="cuda", type="gui") - render_template(f"{i}/sh-build-iso.yml.jinja2", f"{o}/sh-build-iso-rocm.yml" , platform="rocm", type="normal", delay=0) + render_template(f"{i}/sh-build-iso.yml.jinja2", f"{o}/sh-build-iso-rocm.yml" , platform="rocm", type="normal") render_template(f"{i}/gh-build-iso.yml.jinja2", f"{o}/gh-build-iso-rocm-empty.yml", platform="rocm", type="empty") - render_template(f"{i}/sh-build-iso.yml.jinja2", f"{o}/sh-build-iso-rocm-gui.yml" , platform="rocm", type="gui", delay=30) + render_template(f"{i}/sh-build-iso.yml.jinja2", f"{o}/sh-build-iso-rocm-gui.yml" , platform="rocm", type="gui") if __name__ == "__main__": main() diff --git a/.ci/options.ini b/.ci/options.ini index f3add5d..99ee09e 100644 --- a/.ci/options.ini +++ b/.ci/options.ini @@ -11,12 +11,20 @@ vllm = https://github.com/vllm-project/vllm.git [revisions] automatic = de267390905335d353deab3e9ac2031432f4d305 -axolotl = 68601ec6ad1cc0e8cb855376586e6eef6a8aa270 +axolotl = v0.4.0 comfyui = 8dc19e40d129c8ee049be7be2657458509717ba5 -koboldcpp = 593f08bb78ab6035f91cc7aa753975254f30ed82 -llamacpp = 784e11dea1f5ce9638851b2b0dddb107e2a609c8 -sillytavern = 47b656260595967ad70b749845f7b5b33ed3631c +koboldcpp = v1.63 +llamacpp = b2724 +sillytavern = 1.11.8 sillytavern_extras = 1d82f3a8607319d1e09a2f4749a09c564c18c320 -text_generation_webui = ad122361ea1dbc4b419214891b83f6b9ac12f947 -vllm = a395a638c2f18d549e7d01655cf7a6dbee566f91 +text_generation_webui = snapshot-2024-04-21 +vllm = v0.4.1 + +[strategy] +axolotl = release +koboldcpp = release +llamacpp = release +sillytavern = release +text_generation_webui = release +vllm = release diff --git a/.ci/template/gh-build-iso.yml.jinja2 b/.ci/template/gh-build-iso.yml.jinja2 index cfcaf10..6a8457b 100644 --- a/.ci/template/gh-build-iso.yml.jinja2 +++ b/.ci/template/gh-build-iso.yml.jinja2 @@ -60,8 +60,14 @@ jobs: # Exit on error set -eu - # Print checksums to summary - sha256sum out/* > "$GITHUB_STEP_SUMMARY" + # Start code section + echo '`' > "$GITHUB_STEP_SUMMARY" + + # Print checksums + sha256sum out/* | sed 's/out\///' >> "$GITHUB_STEP_SUMMARY" + + # End code section + echo '`' >> "$GITHUB_STEP_SUMMARY" - name: Upload artifacts uses: actions/upload-artifact@v4 diff --git a/.ci/template/sh-build-iso.yml.jinja2 b/.ci/template/sh-build-iso.yml.jinja2 index 7508eb1..cb0fe62 100644 --- a/.ci/template/sh-build-iso.yml.jinja2 +++ b/.ci/template/sh-build-iso.yml.jinja2 @@ -1,9 +1,7 @@ name: Build ISO on selfhosted runner ({{ "CUDA" if type == "cuda" else "ROCm" }}, {{ type }}) on: - push: - branches: - - main + workflow_dispatch: jobs: vm-start: @@ -30,33 +28,6 @@ jobs: # Fix permissions for private key chmod 600 /tmp/private.key - - name: Wait {{ delay }} seconds - run: | - sleep {{ delay }} - - - name: Wait until Github Actions Runner VM is stopped - run: | - ok="0" - - while true; do - status=$(ssh runner "virsh domstate GithubActions") - - if [ "$status" = "shutoff" ]; then - if [ "$ok" = "1" ]; then - echo "VM is shut off. Exiting." - break - else - sleep $((10 + $RANDOM % 10)) - ok="1" - fi - else - ok="0" - fi - - echo "VM is not shut off yet. Waiting for 5 seconds..." - sleep 5 - done - - name: Start Github Actions Runner VM run: | ssh runner "virsh start GithubActions" @@ -109,8 +80,14 @@ jobs: # Exit on error set -eu - # Print checksums to summary - sha256sum out/* > "$GITHUB_STEP_SUMMARY" + # Start code section + echo '`' > "$GITHUB_STEP_SUMMARY" + + # Print checksums + sha256sum out/* | sed 's/out\///' >> "$GITHUB_STEP_SUMMARY" + + # End code section + echo '`' >> "$GITHUB_STEP_SUMMARY" - name: Upload artifacts uses: actions/upload-artifact@v4 @@ -150,3 +127,6 @@ jobs: # Wait 2 minutes sleep 120 + + # Forcefully stop VM if needed + ssh runner "virsh destroy GithubActions" || true diff --git a/.ci/update.py b/.ci/update.py index f03d462..f3d74c0 100755 --- a/.ci/update.py +++ b/.ci/update.py @@ -3,25 +3,42 @@ import configparser import requests -def fetch_latest_revision(url): +def fetch_latest_revision(url, strategy): # github if url.startswith("https://github.com/") and url.endswith(".git"): # extract repo path path = url[19:-4] - # get commits from api - response = requests.get(f"https://api.github.com/repos/{path}/commits") + match strategy: + case "commit": + # get commits from api + response = requests.get(f"https://api.github.com/repos/{path}/commits") - # throw error if not success - response.raise_for_status() + # throw error if not success + response.raise_for_status() - # parse json - data = response.json() + # parse json + data = response.json() - # return first commit id - return data[0]["sha"] + # return first commit id + return data[0]["sha"] - raise ValueError(f"Unsupported: {url}") + case "release": + # get releases from api + response = requests.get(f"https://api.github.com/repos/{path}/releases") + + # throw error if not success + response.raise_for_status() + + # parse json + data = response.json() + + # find first release + for release in data: + if not release["prerelease"]: + return release["tag_name"] + + raise ValueError(f"Unsupported url or strategy ({url}, {strategy})") def main(): # load options @@ -29,11 +46,25 @@ def main(): config.read(".ci/options.ini") # default option value - config["revisions"] = {} + if "revisions" not in config: + config["revisions"] = {} + + # default option value + if "strategy" not in config: + config["strategy"] = {} # iterate over repositories for key, value in config.items("repositories"): - config["revisions"][key] = fetch_latest_revision(value) + # update strategy + strategy = "commit" + + # extract strategy + if key in config["strategy"]: + strategy = config["strategy"][key] + + # if not locked, update + if strategy != "locked": + config["revisions"][key] = fetch_latest_revision(value, strategy) # write config back with open(".ci/options.ini", "w") as file: diff --git a/.github/workflows/gh-build-iso-cuda-empty.yml b/.github/workflows/gh-build-iso-cuda-empty.yml index c7d2325..f8baf23 100644 --- a/.github/workflows/gh-build-iso-cuda-empty.yml +++ b/.github/workflows/gh-build-iso-cuda-empty.yml @@ -51,8 +51,14 @@ jobs: # Exit on error set -eu - # Print checksums to summary - sha256sum out/* > "$GITHUB_STEP_SUMMARY" + # Start code section + echo '`' > "$GITHUB_STEP_SUMMARY" + + # Print checksums + sha256sum out/* | sed 's/out\///' >> "$GITHUB_STEP_SUMMARY" + + # End code section + echo '`' >> "$GITHUB_STEP_SUMMARY" - name: Upload artifacts uses: actions/upload-artifact@v4 diff --git a/.github/workflows/gh-build-iso-cuda-gui.yml b/.github/workflows/gh-build-iso-cuda-gui.yml index 716ad4d..cc0bec5 100644 --- a/.github/workflows/gh-build-iso-cuda-gui.yml +++ b/.github/workflows/gh-build-iso-cuda-gui.yml @@ -53,8 +53,14 @@ jobs: # Exit on error set -eu - # Print checksums to summary - sha256sum out/* > "$GITHUB_STEP_SUMMARY" + # Start code section + echo '`' > "$GITHUB_STEP_SUMMARY" + + # Print checksums + sha256sum out/* | sed 's/out\///' >> "$GITHUB_STEP_SUMMARY" + + # End code section + echo '`' >> "$GITHUB_STEP_SUMMARY" - name: Upload artifacts uses: actions/upload-artifact@v4 diff --git a/.github/workflows/gh-build-iso-cuda.yml b/.github/workflows/gh-build-iso-cuda.yml index b0cb789..829dc77 100644 --- a/.github/workflows/gh-build-iso-cuda.yml +++ b/.github/workflows/gh-build-iso-cuda.yml @@ -53,8 +53,14 @@ jobs: # Exit on error set -eu - # Print checksums to summary - sha256sum out/* > "$GITHUB_STEP_SUMMARY" + # Start code section + echo '`' > "$GITHUB_STEP_SUMMARY" + + # Print checksums + sha256sum out/* | sed 's/out\///' >> "$GITHUB_STEP_SUMMARY" + + # End code section + echo '`' >> "$GITHUB_STEP_SUMMARY" - name: Upload artifacts uses: actions/upload-artifact@v4 diff --git a/.github/workflows/gh-build-iso-rocm-empty.yml b/.github/workflows/gh-build-iso-rocm-empty.yml index 70bca71..dd150ed 100644 --- a/.github/workflows/gh-build-iso-rocm-empty.yml +++ b/.github/workflows/gh-build-iso-rocm-empty.yml @@ -55,8 +55,14 @@ jobs: # Exit on error set -eu - # Print checksums to summary - sha256sum out/* > "$GITHUB_STEP_SUMMARY" + # Start code section + echo '`' > "$GITHUB_STEP_SUMMARY" + + # Print checksums + sha256sum out/* | sed 's/out\///' >> "$GITHUB_STEP_SUMMARY" + + # End code section + echo '`' >> "$GITHUB_STEP_SUMMARY" - name: Upload artifacts uses: actions/upload-artifact@v4 diff --git a/.github/workflows/gh-update-repositories.yml b/.github/workflows/gh-update-repositories.yml new file mode 100644 index 0000000..89f4794 --- /dev/null +++ b/.github/workflows/gh-update-repositories.yml @@ -0,0 +1,25 @@ +name: Update repositories + +on: + schedule: + - cron: "0 0 * * 0" + + workflow_dispatch: + +jobs: + update: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Update repositories + run: .ci/update.py + + - name: Create pull request + uses: peter-evans/create-pull-request@v6 + with: + branch: update-repositories/patch + commit-message: Update repositories + title: Update repositories diff --git a/.github/workflows/sh-build-iso-rocm-gui.yml b/.github/workflows/sh-build-iso-rocm-gui.yml index c75b726..a2e9704 100644 --- a/.github/workflows/sh-build-iso-rocm-gui.yml +++ b/.github/workflows/sh-build-iso-rocm-gui.yml @@ -1,9 +1,7 @@ name: Build ISO on selfhosted runner (ROCm, gui) on: - push: - branches: - - main + workflow_dispatch: jobs: vm-start: @@ -29,33 +27,6 @@ jobs: # Fix permissions for private key chmod 600 /tmp/private.key - - name: Wait 30 seconds - run: | - sleep 30 - - - name: Wait until Github Actions Runner VM is stopped - run: | - ok="0" - - while true; do - status=$(ssh runner "virsh domstate GithubActions") - - if [ "$status" = "shutoff" ]; then - if [ "$ok" = "1" ]; then - echo "VM is shut off. Exiting." - break - else - sleep $((10 + $RANDOM % 10)) - ok="1" - fi - else - ok="0" - fi - - echo "VM is not shut off yet. Waiting for 5 seconds..." - sleep 5 - done - - name: Start Github Actions Runner VM run: | ssh runner "virsh start GithubActions" @@ -103,8 +74,14 @@ jobs: # Exit on error set -eu - # Print checksums to summary - sha256sum out/* > "$GITHUB_STEP_SUMMARY" + # Start code section + echo '`' > "$GITHUB_STEP_SUMMARY" + + # Print checksums + sha256sum out/* | sed 's/out\///' >> "$GITHUB_STEP_SUMMARY" + + # End code section + echo '`' >> "$GITHUB_STEP_SUMMARY" - name: Upload artifacts uses: actions/upload-artifact@v4 @@ -142,4 +119,7 @@ jobs: ssh runner "virsh shutdown GithubActions" # Wait 2 minutes - sleep 120 \ No newline at end of file + sleep 120 + + # Forcefully stop VM if needed + ssh runner "virsh destroy GithubActions" || true \ No newline at end of file diff --git a/.github/workflows/sh-build-iso-rocm.yml b/.github/workflows/sh-build-iso-rocm.yml index 438226a..a570628 100644 --- a/.github/workflows/sh-build-iso-rocm.yml +++ b/.github/workflows/sh-build-iso-rocm.yml @@ -1,9 +1,7 @@ name: Build ISO on selfhosted runner (ROCm, normal) on: - push: - branches: - - main + workflow_dispatch: jobs: vm-start: @@ -29,33 +27,6 @@ jobs: # Fix permissions for private key chmod 600 /tmp/private.key - - name: Wait 0 seconds - run: | - sleep 0 - - - name: Wait until Github Actions Runner VM is stopped - run: | - ok="0" - - while true; do - status=$(ssh runner "virsh domstate GithubActions") - - if [ "$status" = "shutoff" ]; then - if [ "$ok" = "1" ]; then - echo "VM is shut off. Exiting." - break - else - sleep $((10 + $RANDOM % 10)) - ok="1" - fi - else - ok="0" - fi - - echo "VM is not shut off yet. Waiting for 5 seconds..." - sleep 5 - done - - name: Start Github Actions Runner VM run: | ssh runner "virsh start GithubActions" @@ -103,8 +74,14 @@ jobs: # Exit on error set -eu - # Print checksums to summary - sha256sum out/* > "$GITHUB_STEP_SUMMARY" + # Start code section + echo '`' > "$GITHUB_STEP_SUMMARY" + + # Print checksums + sha256sum out/* | sed 's/out\///' >> "$GITHUB_STEP_SUMMARY" + + # End code section + echo '`' >> "$GITHUB_STEP_SUMMARY" - name: Upload artifacts uses: actions/upload-artifact@v4 @@ -142,4 +119,7 @@ jobs: ssh runner "virsh shutdown GithubActions" # Wait 2 minutes - sleep 120 \ No newline at end of file + sleep 120 + + # Forcefully stop VM if needed + ssh runner "virsh destroy GithubActions" || true \ No newline at end of file diff --git a/.github/workflows/sh-do-nothing.yml b/.github/workflows/sh-do-nothing.yml deleted file mode 100644 index a0cee07..0000000 --- a/.github/workflows/sh-do-nothing.yml +++ /dev/null @@ -1,78 +0,0 @@ -name: Do nothing on selfhosted runner - -on: - schedule: - - cron: "30 1 1,15 * *" - - workflow_dispatch: - -jobs: - vm-start: - runs-on: ubuntu-latest - - steps: - - name: Save ssh configuration - run: | - # Create ssh directory - mkdir ~/.ssh - - # Save ssh config - echo "${{ secrets.SSH_CONFIG }}" | base64 -d > ~/.ssh/config - - # Save ssh known hosts - echo "${{ secrets.SSH_KNOWN_HOSTS }}" | base64 -d > ~/.ssh/known_hosts - - # Save ssh private key - echo "${{ secrets.SSH_PRIVATE_KEY }}" | base64 -d > /tmp/private.key - - # Fix permissions for private key - chmod 600 /tmp/private.key - - - name: Start Github Actions Runner VM - run: | - status=$(ssh runner "virsh domstate GithubActions") - - if [ "$status" = "shutoff" ]; then - ssh runner "virsh start GithubActions" - echo "started=true" >> "$GITHUB_OUTPUT" - else - echo "started=false" >> "$GITHUB_OUTPUT" - fi - - do-nothing: - if: ${{ needs.vm-start.outputs.started == 'true' }} - needs: vm-start - runs-on: self-hosted - - steps: - - name: Do nothing - run: | - true - - vm-stop: - if: ${{ needs.vm-start.outputs.started == 'true' }} - needs: do-nothing - runs-on: ubuntu-latest - - steps: - - name: Save ssh configuration - run: | - # Create ssh directory - mkdir ~/.ssh - - # Save ssh config - echo "${{ secrets.SSH_CONFIG }}" | base64 -d > ~/.ssh/config - - # Save ssh known hosts - echo "${{ secrets.SSH_KNOWN_HOSTS }}" | base64 -d > ~/.ssh/known_hosts - - # Save ssh private key - echo "${{ secrets.SSH_PRIVATE_KEY }}" | base64 -d > /tmp/private.key - - # Fix permissions for private key - chmod 600 /tmp/private.key - - - name: Stop Github Actions Runner VM - run: | - # Invoke regular shutdown - ssh runner "virsh shutdown GithubActions" diff --git a/.gitignore b/.gitignore index a66378d..a43e8b8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,9 +10,9 @@ airootfs/root/customize_airootfs/scripts/1000-comfyui.sh airootfs/root/customize_airootfs/scripts/1000-koboldcpp.sh airootfs/root/customize_airootfs/scripts/1000-llamacpp.sh airootfs/root/customize_airootfs/scripts/1000-sillytavern-extras.sh +airootfs/root/customize_airootfs/scripts/1000-sillytavern.sh airootfs/root/customize_airootfs/scripts/1000-text-generation-webui.sh airootfs/root/customize_airootfs/scripts/1000-vllm.sh -airootfs/root/customize_airootfs/scripts/9000-misc.sh airootfs/root/customize_airootfs/scripts/9999-cleanup.sh packages.x86_64 pacman.conf diff --git a/airootfs/etc/ly/config.ini b/airootfs/etc/ly/config.ini new file mode 100644 index 0000000..37dbce4 --- /dev/null +++ b/airootfs/etc/ly/config.ini @@ -0,0 +1,5 @@ +# Erase password input on failure +blank_password = true + +# Input box active by default on startup +default_input = 1 diff --git a/airootfs/etc/nodm.conf b/airootfs/etc/nodm.conf deleted file mode 100644 index 373df36..0000000 --- a/airootfs/etc/nodm.conf +++ /dev/null @@ -1,23 +0,0 @@ -# nodm configuration file - -# Controls the user that is used to automatically log in -NODM_USER='tori' - -# Options to pass to the X server (for example: "vt7 -nolisten -# tcp") -NODM_X_OPTIONS='vt7 -nolisten tcp' - -# Minimum time (in seconds) that a session should last in order -# for nodm to decide that it has not quit too soon. If an X -# session will run for less than this time, nodm will wait an -# increasing bit of time before restarting it. -NODM_MIN_SESSION_TIME=60 - -# X session command (default: /etc/X11/Xsession). It is run using -# the shell, so it can be any shell command. -NODM_XSESSION='/home/tori/.xinitrc' - -# Timeout (in seconds) to wait for X to be ready to accept -# connections. If X is not ready before this timeout, it is killed -# and restarted. -NODM_X_TIMEOUT=20 diff --git a/airootfs/home/tori/.config/openbox/menu.xml b/airootfs/home/tori/.config/openbox/menu.xml index c7b5740..a1d1f20 100644 --- a/airootfs/home/tori/.config/openbox/menu.xml +++ b/airootfs/home/tori/.config/openbox/menu.xml @@ -61,6 +61,22 @@ konsole -e nvtop + + + + + + + systemctl reboot + + + + + + systemctl poweroff + + + diff --git a/airootfs/root/customize_airootfs.sh.jinja2 b/airootfs/root/customize_airootfs.sh.jinja2 index b05f0f9..4e44ff5 100644 --- a/airootfs/root/customize_airootfs.sh.jinja2 +++ b/airootfs/root/customize_airootfs.sh.jinja2 @@ -44,8 +44,8 @@ systemctl enable nvidia-persistenced {% endif %} {% if type == "gui" %} -# enable nodm -systemctl enable nodm +# enable ly +systemctl enable ly {% endif %} {% if type != "empty" %} @@ -62,6 +62,10 @@ for script in $CUSTOMIZE_AIROOTFS/scripts/*.sh; do # launch script as user su tori -c "$script" + + {% if platform == "rocm" %} + rdfind -checksum sha256 -makehardlinks true -makeresultsfile false "." + {% endif %} done {% endif %} diff --git a/airootfs/root/customize_airootfs/scripts/1000-vllm.sh.jinja2 b/airootfs/root/customize_airootfs/scripts/1000-vllm.sh.jinja2 index 143fefc..2cdff64 100644 --- a/airootfs/root/customize_airootfs/scripts/1000-vllm.sh.jinja2 +++ b/airootfs/root/customize_airootfs/scripts/1000-vllm.sh.jinja2 @@ -41,6 +41,9 @@ pushd "vllm" pip3 install nvidia-pstate {% endif %} + # install triton with pascal support + pip3 install "git+https://github.com/sasha0552/triton.git@2.2.0+pascal#subdirectory=python" + # install dependencies pip3 install -r requirements-cuda.txt deactivate diff --git a/airootfs/root/customize_airootfs/scripts/9999-cleanup.sh.jinja2 b/airootfs/root/customize_airootfs/scripts/9999-cleanup.sh.jinja2 index c1ef39f..f15db52 100644 --- a/airootfs/root/customize_airootfs/scripts/9999-cleanup.sh.jinja2 +++ b/airootfs/root/customize_airootfs/scripts/9999-cleanup.sh.jinja2 @@ -10,6 +10,12 @@ rm -fr /home/tori/.config/matplotlib # keras rm -fr /home/tori/.keras +# npm +rm -fr /home/tori/.npm + +# triton +rm -fr /home/tori/.triton + # automatic installation config rm -f /home/tori/automatic/config.json diff --git a/efiboot/loader/entries/00-default.conf b/efiboot/loader/entries/00-default.conf index 9f01b47..aca4140 100644 --- a/efiboot/loader/entries/00-default.conf +++ b/efiboot/loader/entries/00-default.conf @@ -2,4 +2,4 @@ linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/intel-ucode.img initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img -options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=1G +options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=2G diff --git a/packages.x86_64.jinja2 b/packages.x86_64.jinja2 index f02e20e..4fcdb22 100644 --- a/packages.x86_64.jinja2 +++ b/packages.x86_64.jinja2 @@ -31,6 +31,7 @@ progress pv python-pip qemu-guest-agent +rdfind reptyr screen sudo @@ -56,7 +57,7 @@ gtk3 {% if type == "gui" %} # GUI feh -nodm +ly obconf openbox tint2 diff --git a/syslinux/syslinux.cfg b/syslinux/syslinux.cfg index 3ebc87c..7e429f7 100644 --- a/syslinux/syslinux.cfg +++ b/syslinux/syslinux.cfg @@ -2,4 +2,4 @@ DEFAULT default LABEL default LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux INITRD /%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=1G +APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=2G