From 02acd8faf63692b60e5ca25af97d8ec3d5a6023b Mon Sep 17 00:00:00 2001 From: Tyler McGurrin Date: Sun, 17 Nov 2024 17:39:34 -0500 Subject: [PATCH] moved baseline DIR to min and fixed the makeiso.sh script --- makeiso.sh | 4 ++-- {baseline => mini}/airootfs/etc/locale.conf | 0 .../airootfs/etc/mkinitcpio.conf.d/archiso.conf | 0 {baseline => mini}/airootfs/etc/mkinitcpio.d/linux.preset | 0 {baseline => mini}/airootfs/etc/pacman.conf | 0 {baseline => mini}/airootfs/etc/shadow | 0 .../airootfs/etc/ssh/sshd_config.d/10-archiso.conf | 0 .../etc/systemd/network.conf.d/ipv6-privacy-extensions.conf | 0 .../airootfs/etc/systemd/network/20-ethernet.network | 0 .../airootfs/etc/systemd/resolved.conf.d/archiso.conf | 0 .../wait-for-only-one-interface.conf | 0 {baseline => mini}/airootfs/etc/vconsole.conf | 0 {baseline => mini}/bootstrap_packages.i686 | 0 .../efiboot/loader/entries/01-archiso-x86_64-linux.conf | 0 {baseline => mini}/efiboot/loader/loader.conf | 0 {baseline => mini}/grub/grub.cfg | 0 {baseline => mini}/grub/loopback.cfg | 0 {baseline => mini}/packages.i686 | 0 {baseline => mini}/pacman.conf | 0 {baseline => mini}/profiledef.sh | 0 {baseline => mini}/syslinux/syslinux-linux.cfg | 0 {baseline => mini}/syslinux/syslinux.cfg | 0 22 files changed, 2 insertions(+), 2 deletions(-) rename {baseline => mini}/airootfs/etc/locale.conf (100%) rename {baseline => mini}/airootfs/etc/mkinitcpio.conf.d/archiso.conf (100%) rename {baseline => mini}/airootfs/etc/mkinitcpio.d/linux.preset (100%) rename {baseline => mini}/airootfs/etc/pacman.conf (100%) rename {baseline => mini}/airootfs/etc/shadow (100%) rename {baseline => mini}/airootfs/etc/ssh/sshd_config.d/10-archiso.conf (100%) rename {baseline => mini}/airootfs/etc/systemd/network.conf.d/ipv6-privacy-extensions.conf (100%) rename {baseline => mini}/airootfs/etc/systemd/network/20-ethernet.network (100%) rename {baseline => mini}/airootfs/etc/systemd/resolved.conf.d/archiso.conf (100%) rename {baseline => mini}/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf (100%) rename {baseline => mini}/airootfs/etc/vconsole.conf (100%) rename {baseline => mini}/bootstrap_packages.i686 (100%) rename {baseline => mini}/efiboot/loader/entries/01-archiso-x86_64-linux.conf (100%) rename {baseline => mini}/efiboot/loader/loader.conf (100%) rename {baseline => mini}/grub/grub.cfg (100%) rename {baseline => mini}/grub/loopback.cfg (100%) rename {baseline => mini}/packages.i686 (100%) rename {baseline => mini}/pacman.conf (100%) rename {baseline => mini}/profiledef.sh (100%) rename {baseline => mini}/syslinux/syslinux-linux.cfg (100%) rename {baseline => mini}/syslinux/syslinux.cfg (100%) diff --git a/makeiso.sh b/makeiso.sh index e5283fb..bcae3d3 100755 --- a/makeiso.sh +++ b/makeiso.sh @@ -6,7 +6,7 @@ echo Adding Keys git clone https://aur.archlinux.org/archlinux32-keyring.git cd archlinux32-keyring -makepkg -si --skippgpcheck +makepkg -si --skippgpcheck --noconfirm cd .. sudo pacman-key --init sudo pacman-key --populate @@ -14,7 +14,7 @@ sudo pacman-key --populate echo Making ISO... mkdir -p out/ mkdir -p work/ -sudo mkarchiso -v -o out/ -w work/ -L Arch32MINI -P Xircon -m iso baseline/ +sudo mkarchiso -v -o out/ -w work/ -L Arch32MINI -P Xircon -m iso mini/ echo Cleanup sudo rm -rf work/ diff --git a/baseline/airootfs/etc/locale.conf b/mini/airootfs/etc/locale.conf similarity index 100% rename from baseline/airootfs/etc/locale.conf rename to mini/airootfs/etc/locale.conf diff --git a/baseline/airootfs/etc/mkinitcpio.conf.d/archiso.conf b/mini/airootfs/etc/mkinitcpio.conf.d/archiso.conf similarity index 100% rename from baseline/airootfs/etc/mkinitcpio.conf.d/archiso.conf rename to mini/airootfs/etc/mkinitcpio.conf.d/archiso.conf diff --git a/baseline/airootfs/etc/mkinitcpio.d/linux.preset b/mini/airootfs/etc/mkinitcpio.d/linux.preset similarity index 100% rename from baseline/airootfs/etc/mkinitcpio.d/linux.preset rename to mini/airootfs/etc/mkinitcpio.d/linux.preset diff --git a/baseline/airootfs/etc/pacman.conf b/mini/airootfs/etc/pacman.conf similarity index 100% rename from baseline/airootfs/etc/pacman.conf rename to mini/airootfs/etc/pacman.conf diff --git a/baseline/airootfs/etc/shadow b/mini/airootfs/etc/shadow similarity index 100% rename from baseline/airootfs/etc/shadow rename to mini/airootfs/etc/shadow diff --git a/baseline/airootfs/etc/ssh/sshd_config.d/10-archiso.conf b/mini/airootfs/etc/ssh/sshd_config.d/10-archiso.conf similarity index 100% rename from baseline/airootfs/etc/ssh/sshd_config.d/10-archiso.conf rename to mini/airootfs/etc/ssh/sshd_config.d/10-archiso.conf diff --git a/baseline/airootfs/etc/systemd/network.conf.d/ipv6-privacy-extensions.conf b/mini/airootfs/etc/systemd/network.conf.d/ipv6-privacy-extensions.conf similarity index 100% rename from baseline/airootfs/etc/systemd/network.conf.d/ipv6-privacy-extensions.conf rename to mini/airootfs/etc/systemd/network.conf.d/ipv6-privacy-extensions.conf diff --git a/baseline/airootfs/etc/systemd/network/20-ethernet.network b/mini/airootfs/etc/systemd/network/20-ethernet.network similarity index 100% rename from baseline/airootfs/etc/systemd/network/20-ethernet.network rename to mini/airootfs/etc/systemd/network/20-ethernet.network diff --git a/baseline/airootfs/etc/systemd/resolved.conf.d/archiso.conf b/mini/airootfs/etc/systemd/resolved.conf.d/archiso.conf similarity index 100% rename from baseline/airootfs/etc/systemd/resolved.conf.d/archiso.conf rename to mini/airootfs/etc/systemd/resolved.conf.d/archiso.conf diff --git a/baseline/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/mini/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf similarity index 100% rename from baseline/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf rename to mini/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf diff --git a/baseline/airootfs/etc/vconsole.conf b/mini/airootfs/etc/vconsole.conf similarity index 100% rename from baseline/airootfs/etc/vconsole.conf rename to mini/airootfs/etc/vconsole.conf diff --git a/baseline/bootstrap_packages.i686 b/mini/bootstrap_packages.i686 similarity index 100% rename from baseline/bootstrap_packages.i686 rename to mini/bootstrap_packages.i686 diff --git a/baseline/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/mini/efiboot/loader/entries/01-archiso-x86_64-linux.conf similarity index 100% rename from baseline/efiboot/loader/entries/01-archiso-x86_64-linux.conf rename to mini/efiboot/loader/entries/01-archiso-x86_64-linux.conf diff --git a/baseline/efiboot/loader/loader.conf b/mini/efiboot/loader/loader.conf similarity index 100% rename from baseline/efiboot/loader/loader.conf rename to mini/efiboot/loader/loader.conf diff --git a/baseline/grub/grub.cfg b/mini/grub/grub.cfg similarity index 100% rename from baseline/grub/grub.cfg rename to mini/grub/grub.cfg diff --git a/baseline/grub/loopback.cfg b/mini/grub/loopback.cfg similarity index 100% rename from baseline/grub/loopback.cfg rename to mini/grub/loopback.cfg diff --git a/baseline/packages.i686 b/mini/packages.i686 similarity index 100% rename from baseline/packages.i686 rename to mini/packages.i686 diff --git a/baseline/pacman.conf b/mini/pacman.conf similarity index 100% rename from baseline/pacman.conf rename to mini/pacman.conf diff --git a/baseline/profiledef.sh b/mini/profiledef.sh similarity index 100% rename from baseline/profiledef.sh rename to mini/profiledef.sh diff --git a/baseline/syslinux/syslinux-linux.cfg b/mini/syslinux/syslinux-linux.cfg similarity index 100% rename from baseline/syslinux/syslinux-linux.cfg rename to mini/syslinux/syslinux-linux.cfg diff --git a/baseline/syslinux/syslinux.cfg b/mini/syslinux/syslinux.cfg similarity index 100% rename from baseline/syslinux/syslinux.cfg rename to mini/syslinux/syslinux.cfg