changes and fixes.

This commit is contained in:
Patrick 2024-11-11 17:30:12 +01:00
parent 71c9178747
commit a05e697db6
16 changed files with 20 additions and 10 deletions

View file

@ -5,6 +5,7 @@
"download_name": "bookworm",
"repositories": [],
"replace_repositories": "False",
"keyrings": [],
"packages": "grub-pc linux-image-amd64 task-gnome-desktop live-task-standard",
"scripts": [
"configs/scripts/install.sh",

View file

@ -5,6 +5,7 @@
"download_name": "bookworm",
"repositories": [],
"replace_repositories": "False",
"keyrings": [],
"packages": "grub-pc linux-image-amd64 task-kde-desktop live-task-standard",
"scripts": [
"configs/scripts/install.sh",

View file

@ -5,6 +5,7 @@
"download_name": "bookworm",
"repositories": [],
"replace_repositories": "False",
"keyrings": [],
"packages": "grub-pc linux-image-amd64 task-lxqt-desktop live-task-standard",
"scripts": [
"configs/scripts/install.sh",

View file

@ -5,6 +5,7 @@
"download_name": "bookworm",
"repositories": [],
"replace_repositories": "False",
"keyrings": [],
"packages": "grub-pc linux-image-amd64 task-mate-desktop live-task-standard",
"scripts": [
"configs/scripts/install.sh",

View file

@ -5,6 +5,7 @@
"download_name": "bookworm",
"repositories": [],
"replace_repositories": "False",
"keyrings": [],
"packages": "nginx grub-pc linux-image-amd64 live-task-standard",
"scripts": [
"configs/scripts/install.sh",

View file

@ -5,6 +5,7 @@
"download_name": "bookworm",
"repositories": [],
"replace_repositories": "False",
"keyrings": [],
"packages": "grub-pc linux-image-amd64 task-xfce-desktop live-task-standard",
"scripts": [
"configs/scripts/install.sh",

View file

@ -23,16 +23,14 @@ mount --bind /dev /mnt/dev
mount --bind /proc /mnt/proc
mount --bind /sys /mnt/sys
if chroot /mnt /bin/bash -c "command -v grub2-mkconfig &>/dev/null;" then
if chroot /mnt /bin/bash -c "command -v grub2-mkconfig &>/dev/null"; then
chroot /mnt /bin/bash -c "grub2-mkconfig -o /boot/grub/grub.cfg"
elif chroot /mnt /bin/bash -c "command -v grub-mkconfig &>/dev/null;" then
elif chroot /mnt /bin/bash -c "command -v grub-mkconfig &>/dev/null"; then
chroot /mnt /bin/bash -c "grub-mkconfig -o /boot/grub/grub.cfg"
fi
if chroot /mnt /bin/bash -c "command -v grub2-install &>/dev/null;" then
if chroot /mnt /bin/bash -c "command -v grub2-install &>/dev/null"; then
chroot /mnt /bin/bash -c "grub2-install /dev/sda"
elif chroot /mnt /bin/bash -c "command -v grub-install &>/dev/null;" then
elif chroot /mnt /bin/bash -c "command -v grub-install &>/dev/null"; then
chroot /mnt /bin/bash -c "grub-install /dev/sda"
fi

0
configs/scripts/server.sh Normal file → Executable file
View file

0
configs/scripts/user.sh Normal file → Executable file
View file

View file

@ -5,6 +5,7 @@
"download_name": "noble-base-amd64.tar.gz",
"repositories": [],
"replace_repositories": "False",
"keyrings": [],
"packages": "grub-pc linux-image-generic ubuntu-desktop",
"scripts": [
"configs/scripts/install.sh",

View file

@ -5,6 +5,7 @@
"download_name": "noble-base-amd64.tar.gz",
"repositories": [],
"replace_repositories": "False",
"keyrings": [],
"packages": "grub-pc linux-image-generic kubuntu-desktop",
"scripts": [
"configs/scripts/install.sh",

View file

@ -5,6 +5,7 @@
"download_name": "noble-base-amd64.tar.gz",
"repositories": [],
"replace_repositories": "False",
"keyrings": [],
"packages": "grub-pc linux-image-generic lubuntu-desktop",
"scripts": [
"configs/scripts/install.sh",

View file

@ -5,6 +5,7 @@
"download_name": "noble-base-amd64.tar.gz",
"repositories": [],
"replace_repositories": "False",
"keyrings": [],
"packages": "grub-pc linux-image-generic ubuntu-mate-desktop",
"scripts": [
"configs/scripts/install.sh",

View file

@ -5,6 +5,7 @@
"download_name": "noble-base-amd64.tar.gz",
"repositories": [],
"replace_repositories": "False",
"keyrings": [],
"packages": "nginx grub-pc linux-image-generic",
"scripts": [
"configs/scripts/install.sh",

View file

@ -5,6 +5,7 @@
"download_name": "noble-base-amd64.tar.gz",
"repositories": [],
"replace_repositories": "False",
"keyrings": [],
"packages": "grub-pc linux-image-generic xubuntu-desktop",
"scripts": [
"configs/scripts/install.sh",

View file

@ -177,10 +177,10 @@ def apt_rootfs_prepare(
do_chroot_command(f"echo '{repository}' >/etc/apt/sources.list")
overwritten + True
for download, name in keyrings:
do_chroot_command(f"wget {download}")
do_chroot_command(f"dpkg -i {name}")
do_chroot_command(f"rm {name}")
for keyring in keyrings:
do_chroot_command(f"wget {keyring["download"]}")
do_chroot_command(f"dpkg -i {keyring["name"]}")
do_chroot_command(f"rm {keyring["name"]}")
do_chroot_command("apt update -y")
do_chroot_command("apt full-upgrade -y")