From b4f93d1a74b6b9d938d728ae1bf93b6e72510afe Mon Sep 17 00:00:00 2001 From: Valeria Fadeeva Date: Mon, 6 Nov 2023 20:34:31 +0500 Subject: [PATCH] Update --- .gitignore | 14 ++-- boot/melawy1-grub2.sh | 71 ++++++++++++++++++ boot/melawy1-refind.sh | 71 ++++++++++++++++++ boot/melawy1-systemd-boot.sh | 71 ++++++++++++++++++ boot/melawy2-grub2.sh | 71 ++++++++++++++++++ boot/melawy2-refind.sh | 71 ++++++++++++++++++ boot/melawy2-systemd-boot.sh | 71 ++++++++++++++++++ {.vscode => make_iso/.vscode}/settings.json | 0 .../00_reset_light.sh | 0 .../00_reset_with_packages.sh | 0 .../01_rank_mirrorlist.sh | 0 02_prepare.sh => make_iso/02_prepare.sh | 0 03_chown.sh => make_iso/03_chown.sh | 0 04_make.sh => make_iso/04_make.sh | 0 05_sign.sh => make_iso/05_sign.sh | 0 06_chown.sh => make_iso/06_chown.sh | 0 LICENSE => make_iso/LICENSE | 0 .../etc/NetworkManager/NetworkManager.conf | 0 .../NetworkManager/dispatcher.d/09-timezone | 0 .../etc/X11/xorg.conf.d/30-touchpad.conf | 0 .../airootfs}/etc/dracut.conf.d/defaults.conf | 0 .../airootfs}/etc/environment | 0 .../airootfs}/etc/fonts/local.conf | 0 {airootfs => make_iso/airootfs}/etc/group | 0 {airootfs => make_iso/airootfs}/etc/gshadow | 0 {airootfs => make_iso/airootfs}/etc/hostname | 0 {airootfs => make_iso/airootfs}/etc/issue | 0 .../airootfs}/etc/locale.conf | 0 .../airootfs}/etc/locale.gen | 0 {airootfs => make_iso/airootfs}/etc/localtime | 0 .../airootfs}/etc/machine-id | 0 .../airootfs}/etc/makepkg.conf | 0 .../airootfs}/etc/mkinitcpio.conf | 0 .../etc/mkinitcpio.d/linux-hardened.preset | 0 .../etc/mkinitcpio.d/linux-xanmod.preset | 0 .../airootfs}/etc/modprobe.d/broadcom-wl.conf | 0 .../airootfs}/etc/modprobe.d/iwlwifi.conf | 0 .../etc/modprobe.d/nvidia-utils.conf | 0 .../etc/modules-load.d/nvidia-utils.conf | 0 .../airootfs}/etc/modules-load.d/zfs.conf | 0 {airootfs => make_iso/airootfs}/etc/motd | 0 .../airootfs}/etc/nsswitch.conf | 0 .../airootfs}/etc/pacman-cache.conf | 0 .../airootfs}/etc/pacman-std.conf | 0 .../airootfs}/etc/pacman.conf | 0 .../airootfs}/etc/pacman.d/gnupg/gpg.conf | 0 .../etc/pacman.d/hooks/uncomment-mirrors.hook | 0 ...z99-remove-custom-hooks-from-airootfs.hook | 0 .../airootfs}/etc/pacman.d/mirrorlist | 0 .../airootfs}/etc/pamac.conf | 0 {airootfs => make_iso/airootfs}/etc/passwd | 0 .../airootfs}/etc/plymouth/plymouthd.conf | 0 .../etc/polkit-1/rules.d/10-timedate.rules | 0 .../polkit-1/rules.d/49-nopasswd_global.rules | 0 .../etc/refind-menu-generator/theme.conf | 0 .../airootfs}/etc/reflector-simple.conf | 0 .../airootfs}/etc/resolv.conf | 0 {airootfs => make_iso/airootfs}/etc/sddm.conf | 0 .../etc/sddm.conf.d/kde_settings.conf | 0 {airootfs => make_iso/airootfs}/etc/shadow | 0 .../airootfs}/etc/skel/.Xresources | 0 .../airootfs}/etc/skel/.bashrc | 0 .../etc/ssh/sshd_config.d/10-archiso.conf | 0 .../airootfs}/etc/sudoers.d/g_wheel | 0 .../airootfs}/etc/sysctl.d/99-local.conf | 0 .../airootfs}/etc/systemd/journald.conf | 0 .../journald.conf.d/volatile-storage.conf | 0 .../airootfs}/etc/systemd/logind.conf | 0 .../systemd/logind.conf.d/do-not-suspend.conf | 0 .../etc/systemd/network/20-ethernet.network | 0 .../etc/systemd/network/20-wlan.network | 0 .../etc/systemd/network/20-wwan.network | 0 .../etc/systemd/resolved.conf.d/archiso.conf | 0 .../systemd-gpt-auto-generator | 0 .../bluetooth.target.wants/bluetooth.service | 0 .../etc/systemd/system/choose-mirror.service | 0 .../cloud-config.service | 0 .../cloud-final.service | 0 .../cloud-init-local.service | 0 .../cloud-init.service | 0 .../system/dbus-fi.w1.wpa_supplicant1.service | 0 .../etc/systemd/system/dbus-org.bluez.service | 0 .../system/dbus-org.freedesktop.Avahi.service | 0 ...dbus-org.freedesktop.ModemManager1.service | 0 .../dbus-org.freedesktop.network1.service | 0 ...dbus-org.freedesktop.nm-dispatcher.service | 0 .../dbus-org.freedesktop.resolve1.service | 0 .../dbus-org.freedesktop.timesync1.service | 0 .../etc/systemd/system/default.target | 0 .../systemd/system/display-manager.service | 0 .../systemd/system/etc-pacman.d-gnupg.mount | 0 .../getty@tty1.service.d/autologin.conf | 0 .../etc/systemd/system/intel.service | 0 .../system/livecd-alsa-unmuter.service | 0 .../etc/systemd/system/livecd-talk.service | 0 .../ModemManager.service | 0 .../NetworkManager.service | 0 .../avahi-daemon.service | 0 .../multi-user.target.wants/bluetooth.service | 0 .../choose-mirror.service | 0 .../multi-user.target.wants/firewalld.service | 0 .../hv_fcopy_daemon.service | 0 .../hv_kvp_daemon.service | 0 .../hv_vss_daemon.service | 0 .../multi-user.target.wants/intel.service | 0 .../multi-user.target.wants/iwd.service | 0 .../livecd-talk.service | 0 .../multi-user.target.wants/ntpd.service | 0 .../pacman-init.service | 0 .../pamac-cleancache.timer | 0 .../multi-user.target.wants/reflector.service | 0 .../multi-user.target.wants/remote-fs.target | 0 .../spice-vdagentd.socket | 0 .../multi-user.target.wants/sshd.service | 0 .../systemd-networkd.service | 0 .../systemd-resolved.service | 0 .../systemd-timesyncd.service | 0 .../vboxclient.service | 0 .../vboxservice.service | 0 .../multi-user.target.wants/vcheck.service | 0 .../multi-user.target.wants/vmtoolsd.service | 0 .../vmware-vmblock-fuse.service | 0 .../wpa_supplicant.service | 0 .../NetworkManager-wait-online.service | 0 .../etc/systemd/system/pacman-init.service | 0 .../system/reflector.service.d/archiso.conf | 0 .../sockets.target.wants/avahi-daemon.socket | 0 .../system/sockets.target.wants/pcscd.socket | 0 .../systemd-networkd.socket | 0 .../livecd-alsa-unmuter.service | 0 .../systemd-time-wait-sync.service | 0 .../systemd-timesyncd.service | 0 .../wait-for-only-one-interface.conf | 0 .../airootfs}/etc/systemd/timesyncd.conf | 0 .../airootfs}/etc/vconsole.conf | 0 .../etc/xdg/reflector/reflector.conf | 0 .../airootfs}/opt/extra-drivers/packages_here | 0 .../airootfs}/root/.automated_script.sh | 0 .../airootfs}/root/.gnupg/scdaemon.conf | 0 {airootfs => make_iso/airootfs}/root/.zlogin | 0 .../airootfs}/root/archives/README | 0 .../airootfs}/root/customize_airootfs.sh | 0 .../airootfs}/root/packages/README | 0 .../airootfs}/usr/bin/GPU-Intel-installer | 0 .../usr/local/bin/Installation_guide | 0 .../airootfs}/usr/local/bin/calamares-offline | 0 .../airootfs}/usr/local/bin/calamares-online | 0 .../airootfs}/usr/local/bin/choose-mirror | 0 .../usr/local/bin/chrooted-cleaner-script | 0 .../airootfs}/usr/local/bin/cleaner-script | 0 .../usr/local/bin/connection-checker | 0 .../usr/local/bin/copy-refind-theme_v1 | 0 .../usr/local/bin/copy-refind-theme_v2 | 0 .../usr/local/bin/create-pacman-keyring | 0 .../airootfs}/usr/local/bin/dmcheck | 0 .../airootfs}/usr/local/bin/fix-key | 0 .../airootfs}/usr/local/bin/fix-keys | 0 .../airootfs}/usr/local/bin/fixkey | 0 .../airootfs}/usr/local/bin/fixkeys | 0 .../airootfs}/usr/local/bin/livecd-sound | 0 .../local/bin/online-install-nvidia-drivers | 0 .../usr/local/bin/prepare-live-desktop | 0 .../airootfs}/usr/local/bin/remove-ucode | 0 .../airootfs}/usr/local/bin/remove-unneeded | 0 .../airootfs}/usr/local/bin/update-mirrorlist | 0 .../local/share/livecd-sound/asound.conf.in | 0 .../share/X11/xorg.conf.d/30-touchpad.conf | 0 .../usr/share/packages/packages_here | 0 .../bootstrap_packages.x86_64 | 0 {efiboot => make_iso/efiboot}/MokManager.efi | Bin .../entries/01-archiso-x86_64-linux.conf | 0 .../entries/02-archiso-x86_64-linux-nv.conf | 0 .../loader/entries/03-archiso-x86_64-efi.conf | 0 .../entries/04-archiso-x86_64-efi-nv.conf | 0 .../efiboot}/loader/loader.conf | 0 ...enerate_packages.x86_64_from_netinstall.py | 0 {grub => make_iso/grub}/grub.cfg | 0 {info => make_iso/info}/info.sh | 0 {info => make_iso/info}/packages.x86_64 | 0 .../mkarchiso_last_my | 0 netinstall.yaml => make_iso/netinstall.yaml | 0 packages.x86_64 => make_iso/packages.x86_64 | 0 .../packages.x86_64.max | 0 .../packages.x86_64.min | 0 pacman_sys.conf => make_iso/pacman_sys.conf | 0 profiledef.sh => make_iso/profiledef.sh | 0 .../syslinux}/archiso_head.cfg | 0 .../syslinux}/archiso_pxe-linux.cfg | 0 .../syslinux}/archiso_pxe.cfg | 0 .../syslinux}/archiso_sys-linux.cfg | 0 .../syslinux}/archiso_sys.cfg | 0 .../syslinux}/archiso_tail.cfg | 0 {syslinux => make_iso/syslinux}/splash.png | Bin {syslinux => make_iso/syslinux}/splash1.png | Bin {syslinux => make_iso/syslinux}/splash2.png | Bin {syslinux => make_iso/syslinux}/splash3.png | Bin {syslinux => make_iso/syslinux}/syslinux.cfg | 0 07_push.sh => push.sh | 0 198 files changed, 435 insertions(+), 5 deletions(-) create mode 100755 boot/melawy1-grub2.sh create mode 100755 boot/melawy1-refind.sh create mode 100755 boot/melawy1-systemd-boot.sh create mode 100755 boot/melawy2-grub2.sh create mode 100755 boot/melawy2-refind.sh create mode 100755 boot/melawy2-systemd-boot.sh rename {.vscode => make_iso/.vscode}/settings.json (100%) rename 00_reset_light.sh => make_iso/00_reset_light.sh (100%) rename 00_reset_with_packages.sh => make_iso/00_reset_with_packages.sh (100%) rename 01_rank_mirrorlist.sh => make_iso/01_rank_mirrorlist.sh (100%) rename 02_prepare.sh => make_iso/02_prepare.sh (100%) rename 03_chown.sh => make_iso/03_chown.sh (100%) rename 04_make.sh => make_iso/04_make.sh (100%) rename 05_sign.sh => make_iso/05_sign.sh (100%) rename 06_chown.sh => make_iso/06_chown.sh (100%) rename LICENSE => make_iso/LICENSE (100%) rename {airootfs => make_iso/airootfs}/etc/NetworkManager/NetworkManager.conf (100%) rename {airootfs => make_iso/airootfs}/etc/NetworkManager/dispatcher.d/09-timezone (100%) rename {airootfs => make_iso/airootfs}/etc/X11/xorg.conf.d/30-touchpad.conf (100%) rename {airootfs => make_iso/airootfs}/etc/dracut.conf.d/defaults.conf (100%) rename {airootfs => make_iso/airootfs}/etc/environment (100%) rename {airootfs => make_iso/airootfs}/etc/fonts/local.conf (100%) rename {airootfs => make_iso/airootfs}/etc/group (100%) rename {airootfs => make_iso/airootfs}/etc/gshadow (100%) rename {airootfs => make_iso/airootfs}/etc/hostname (100%) rename {airootfs => make_iso/airootfs}/etc/issue (100%) rename {airootfs => make_iso/airootfs}/etc/locale.conf (100%) rename {airootfs => make_iso/airootfs}/etc/locale.gen (100%) rename {airootfs => make_iso/airootfs}/etc/localtime (100%) rename {airootfs => make_iso/airootfs}/etc/machine-id (100%) rename {airootfs => make_iso/airootfs}/etc/makepkg.conf (100%) rename {airootfs => make_iso/airootfs}/etc/mkinitcpio.conf (100%) rename {airootfs => make_iso/airootfs}/etc/mkinitcpio.d/linux-hardened.preset (100%) rename {airootfs => make_iso/airootfs}/etc/mkinitcpio.d/linux-xanmod.preset (100%) rename {airootfs => make_iso/airootfs}/etc/modprobe.d/broadcom-wl.conf (100%) rename {airootfs => make_iso/airootfs}/etc/modprobe.d/iwlwifi.conf (100%) rename {airootfs => make_iso/airootfs}/etc/modprobe.d/nvidia-utils.conf (100%) rename {airootfs => make_iso/airootfs}/etc/modules-load.d/nvidia-utils.conf (100%) rename {airootfs => make_iso/airootfs}/etc/modules-load.d/zfs.conf (100%) rename {airootfs => make_iso/airootfs}/etc/motd (100%) rename {airootfs => make_iso/airootfs}/etc/nsswitch.conf (100%) rename {airootfs => make_iso/airootfs}/etc/pacman-cache.conf (100%) rename {airootfs => make_iso/airootfs}/etc/pacman-std.conf (100%) rename {airootfs => make_iso/airootfs}/etc/pacman.conf (100%) rename {airootfs => make_iso/airootfs}/etc/pacman.d/gnupg/gpg.conf (100%) rename {airootfs => make_iso/airootfs}/etc/pacman.d/hooks/uncomment-mirrors.hook (100%) rename {airootfs => make_iso/airootfs}/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook (100%) rename {airootfs => make_iso/airootfs}/etc/pacman.d/mirrorlist (100%) rename {airootfs => make_iso/airootfs}/etc/pamac.conf (100%) rename {airootfs => make_iso/airootfs}/etc/passwd (100%) rename {airootfs => make_iso/airootfs}/etc/plymouth/plymouthd.conf (100%) rename {airootfs => make_iso/airootfs}/etc/polkit-1/rules.d/10-timedate.rules (100%) rename {airootfs => make_iso/airootfs}/etc/polkit-1/rules.d/49-nopasswd_global.rules (100%) rename {airootfs => make_iso/airootfs}/etc/refind-menu-generator/theme.conf (100%) rename {airootfs => make_iso/airootfs}/etc/reflector-simple.conf (100%) rename {airootfs => make_iso/airootfs}/etc/resolv.conf (100%) rename {airootfs => make_iso/airootfs}/etc/sddm.conf (100%) rename {airootfs => make_iso/airootfs}/etc/sddm.conf.d/kde_settings.conf (100%) rename {airootfs => make_iso/airootfs}/etc/shadow (100%) rename {airootfs => make_iso/airootfs}/etc/skel/.Xresources (100%) rename {airootfs => make_iso/airootfs}/etc/skel/.bashrc (100%) rename {airootfs => make_iso/airootfs}/etc/ssh/sshd_config.d/10-archiso.conf (100%) rename {airootfs => make_iso/airootfs}/etc/sudoers.d/g_wheel (100%) rename {airootfs => make_iso/airootfs}/etc/sysctl.d/99-local.conf (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/journald.conf (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/journald.conf.d/volatile-storage.conf (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/logind.conf (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/logind.conf.d/do-not-suspend.conf (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/network/20-ethernet.network (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/network/20-wlan.network (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/network/20-wwan.network (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/resolved.conf.d/archiso.conf (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system-generators/systemd-gpt-auto-generator (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/bluetooth.target.wants/bluetooth.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/choose-mirror.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/cloud-init.target.wants/cloud-config.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/cloud-init.target.wants/cloud-final.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/cloud-init.target.wants/cloud-init.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/dbus-fi.w1.wpa_supplicant1.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/dbus-org.bluez.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/dbus-org.freedesktop.Avahi.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/dbus-org.freedesktop.network1.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/dbus-org.freedesktop.resolve1.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/dbus-org.freedesktop.timesync1.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/default.target (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/display-manager.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/etc-pacman.d-gnupg.mount (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/getty@tty1.service.d/autologin.conf (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/intel.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/livecd-alsa-unmuter.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/livecd-talk.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/ModemManager.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/NetworkManager.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/avahi-daemon.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/bluetooth.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/choose-mirror.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/firewalld.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/intel.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/iwd.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/livecd-talk.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/ntpd.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/pacman-init.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/pamac-cleancache.timer (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/reflector.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/remote-fs.target (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/spice-vdagentd.socket (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/sshd.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/systemd-networkd.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/systemd-resolved.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/vboxclient.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/vboxservice.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/vcheck.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/vmtoolsd.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/multi-user.target.wants/wpa_supplicant.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/pacman-init.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/reflector.service.d/archiso.conf (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/sockets.target.wants/avahi-daemon.socket (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/sockets.target.wants/pcscd.socket (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/sockets.target.wants/systemd-networkd.socket (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf (100%) rename {airootfs => make_iso/airootfs}/etc/systemd/timesyncd.conf (100%) rename {airootfs => make_iso/airootfs}/etc/vconsole.conf (100%) rename {airootfs => make_iso/airootfs}/etc/xdg/reflector/reflector.conf (100%) rename {airootfs => make_iso/airootfs}/opt/extra-drivers/packages_here (100%) rename {airootfs => make_iso/airootfs}/root/.automated_script.sh (100%) rename {airootfs => make_iso/airootfs}/root/.gnupg/scdaemon.conf (100%) rename {airootfs => make_iso/airootfs}/root/.zlogin (100%) rename {airootfs => make_iso/airootfs}/root/archives/README (100%) rename {airootfs => make_iso/airootfs}/root/customize_airootfs.sh (100%) rename {airootfs => make_iso/airootfs}/root/packages/README (100%) rename {airootfs => make_iso/airootfs}/usr/bin/GPU-Intel-installer (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/Installation_guide (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/calamares-offline (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/calamares-online (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/choose-mirror (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/chrooted-cleaner-script (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/cleaner-script (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/connection-checker (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/copy-refind-theme_v1 (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/copy-refind-theme_v2 (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/create-pacman-keyring (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/dmcheck (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/fix-key (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/fix-keys (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/fixkey (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/fixkeys (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/livecd-sound (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/online-install-nvidia-drivers (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/prepare-live-desktop (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/remove-ucode (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/remove-unneeded (100%) rename {airootfs => make_iso/airootfs}/usr/local/bin/update-mirrorlist (100%) rename {airootfs => make_iso/airootfs}/usr/local/share/livecd-sound/asound.conf.in (100%) rename {airootfs => make_iso/airootfs}/usr/share/X11/xorg.conf.d/30-touchpad.conf (100%) rename {airootfs => make_iso/airootfs}/usr/share/packages/packages_here (100%) rename bootstrap_packages.x86_64 => make_iso/bootstrap_packages.x86_64 (100%) rename {efiboot => make_iso/efiboot}/MokManager.efi (100%) rename {efiboot => make_iso/efiboot}/loader/entries/01-archiso-x86_64-linux.conf (100%) rename {efiboot => make_iso/efiboot}/loader/entries/02-archiso-x86_64-linux-nv.conf (100%) rename {efiboot => make_iso/efiboot}/loader/entries/03-archiso-x86_64-efi.conf (100%) rename {efiboot => make_iso/efiboot}/loader/entries/04-archiso-x86_64-efi-nv.conf (100%) rename {efiboot => make_iso/efiboot}/loader/loader.conf (100%) rename generate_packages.x86_64_from_netinstall.py => make_iso/generate_packages.x86_64_from_netinstall.py (100%) rename {grub => make_iso/grub}/grub.cfg (100%) rename {info => make_iso/info}/info.sh (100%) rename {info => make_iso/info}/packages.x86_64 (100%) rename mkarchiso_last_my => make_iso/mkarchiso_last_my (100%) rename netinstall.yaml => make_iso/netinstall.yaml (100%) rename packages.x86_64 => make_iso/packages.x86_64 (100%) rename packages.x86_64.max => make_iso/packages.x86_64.max (100%) rename packages.x86_64.min => make_iso/packages.x86_64.min (100%) rename pacman_sys.conf => make_iso/pacman_sys.conf (100%) rename profiledef.sh => make_iso/profiledef.sh (100%) rename {syslinux => make_iso/syslinux}/archiso_head.cfg (100%) rename {syslinux => make_iso/syslinux}/archiso_pxe-linux.cfg (100%) rename {syslinux => make_iso/syslinux}/archiso_pxe.cfg (100%) rename {syslinux => make_iso/syslinux}/archiso_sys-linux.cfg (100%) rename {syslinux => make_iso/syslinux}/archiso_sys.cfg (100%) rename {syslinux => make_iso/syslinux}/archiso_tail.cfg (100%) rename {syslinux => make_iso/syslinux}/splash.png (100%) rename {syslinux => make_iso/syslinux}/splash1.png (100%) rename {syslinux => make_iso/syslinux}/splash2.png (100%) rename {syslinux => make_iso/syslinux}/splash3.png (100%) rename {syslinux => make_iso/syslinux}/syslinux.cfg (100%) rename 07_push.sh => push.sh (100%) diff --git a/.gitignore b/.gitignore index 167cfbc..85e52d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,9 @@ -/airootfs/opt/extra-drivers/*.pkg.tar.* -/airootfs/root/packages/*.pkg.tar.* -/airootfs/usr/share/packages/*.pkg.tar.* -/out -/work +/make_iso/airootfs/opt/extra-drivers/*.pkg.tar.* +/make_iso/airootfs/root/packages/*.pkg.tar.* +/make_iso/airootfs/usr/share/packages/*.pkg.tar.* +/boot/fd/* +/boot/iso/* +/boot/qcow2/* +/boot/txt/* +/boot/shell_scripts +/work/* diff --git a/boot/melawy1-grub2.sh b/boot/melawy1-grub2.sh new file mode 100755 index 0000000..eb60784 --- /dev/null +++ b/boot/melawy1-grub2.sh @@ -0,0 +1,71 @@ +#!/bin/bash + +name=$(basename -s .sh $0) + +numberofcores=$(grep -c ^processor /proc/cpuinfo) + +virt_cpu=$(( $numberofcores/2 )) +smp=$(( $virt_cpu / 2 )) +sockets=$(( $virt_cpu / 2 )) + +mem=$(expr $(cat /proc/meminfo | grep "MemFree" | awk '{print $2}') / 1024 - $(( 2 * 1024 )) ) + +if [[ $mem -lt 6144 ]]; then + mem=6144 +fi + +fd="$name-OVMF_VARS.fd" + +if [ ! -f "./fd/$fd" ]; then + cp -av -- '/usr/share/edk2-ovmf/x64/OVMF_VARS.fd' "./fd/$fd" +fi + +iso=$(find ./iso -name "*.iso" | grep -i "melawy" | tail -n 1) + +qcow2="$name.qcow2" + +if [ ! -f "./qcow2/$qcow2" ]; then + qemu-img create -f qcow2 "./qcow2/$qcow2" 50G +fi + +echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd" + +random_num=$((1 + $RANDOM % 100)) + +qemu-system-x86_64 \ +-name MelawyLinux_$random_num,process=archiso_$random_num,guest=MelawyLinux_$random_num,debug-threads=on \ +-drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \ +-drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \ +-global "driver=cfi.pflash01,property=secure,value=off" \ +-global ICH9-LPC.disable_s3=1 \ +-cdrom ${iso} \ +-drive file="./qcow2/$qcow2,index=0,media=disk,format=qcow2" \ +-boot order=d,menu=on,reboot-timeout=5000 \ +-smbios type=0,uefi=on \ +-smp $smp,sockets=$sockets,cores=1,threads=1 \ +-rtc base=utc,driftfix=slew \ +-cpu host,migratable=on \ +-m "size=$mem,slots=0,maxmem=$(($mem*1024*1024))" \ +-usb \ +-k en-us \ +-vga virtio \ +-display gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on \ +-audiodev pipewire,id=snd0 \ +-device ich9-intel-hda \ +-device hda-output,audiodev=snd0 \ +-device virtio-net-pci,romfile=,netdev=net0 \ +-netdev user,id=net0,hostfwd=tcp::60022-:22 \ +-machine type=pc-q35-8.1,smm=on,accel=kvm,usb=on,vmport=off,dump-guest-core=off,hpet=off,acpi=on,pcspk-audiodev=snd0 \ +-enable-kvm \ +-msg timestamp=on + +# -netdev user,id=net0 \ +# -drive file=shared.img,index=1,media=disk,format=raw \ +# -netdev user,id=net0,hostfwd=tcp::60022-:22 \ +# -serial stdio +# -m 8192 \ +# -display sdl,gl=on,show-cursor=on,window-close=on \ +# -full-screen \ +# -audiodev pa,id=snd0 \ +# -net nic,vlan=0 -net user,vlan=0 +# -net nic,vlan=0 -net user,vlan=0 -netdev user,id=user.0 -device e1000,netdev=user.0 diff --git a/boot/melawy1-refind.sh b/boot/melawy1-refind.sh new file mode 100755 index 0000000..eb60784 --- /dev/null +++ b/boot/melawy1-refind.sh @@ -0,0 +1,71 @@ +#!/bin/bash + +name=$(basename -s .sh $0) + +numberofcores=$(grep -c ^processor /proc/cpuinfo) + +virt_cpu=$(( $numberofcores/2 )) +smp=$(( $virt_cpu / 2 )) +sockets=$(( $virt_cpu / 2 )) + +mem=$(expr $(cat /proc/meminfo | grep "MemFree" | awk '{print $2}') / 1024 - $(( 2 * 1024 )) ) + +if [[ $mem -lt 6144 ]]; then + mem=6144 +fi + +fd="$name-OVMF_VARS.fd" + +if [ ! -f "./fd/$fd" ]; then + cp -av -- '/usr/share/edk2-ovmf/x64/OVMF_VARS.fd' "./fd/$fd" +fi + +iso=$(find ./iso -name "*.iso" | grep -i "melawy" | tail -n 1) + +qcow2="$name.qcow2" + +if [ ! -f "./qcow2/$qcow2" ]; then + qemu-img create -f qcow2 "./qcow2/$qcow2" 50G +fi + +echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd" + +random_num=$((1 + $RANDOM % 100)) + +qemu-system-x86_64 \ +-name MelawyLinux_$random_num,process=archiso_$random_num,guest=MelawyLinux_$random_num,debug-threads=on \ +-drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \ +-drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \ +-global "driver=cfi.pflash01,property=secure,value=off" \ +-global ICH9-LPC.disable_s3=1 \ +-cdrom ${iso} \ +-drive file="./qcow2/$qcow2,index=0,media=disk,format=qcow2" \ +-boot order=d,menu=on,reboot-timeout=5000 \ +-smbios type=0,uefi=on \ +-smp $smp,sockets=$sockets,cores=1,threads=1 \ +-rtc base=utc,driftfix=slew \ +-cpu host,migratable=on \ +-m "size=$mem,slots=0,maxmem=$(($mem*1024*1024))" \ +-usb \ +-k en-us \ +-vga virtio \ +-display gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on \ +-audiodev pipewire,id=snd0 \ +-device ich9-intel-hda \ +-device hda-output,audiodev=snd0 \ +-device virtio-net-pci,romfile=,netdev=net0 \ +-netdev user,id=net0,hostfwd=tcp::60022-:22 \ +-machine type=pc-q35-8.1,smm=on,accel=kvm,usb=on,vmport=off,dump-guest-core=off,hpet=off,acpi=on,pcspk-audiodev=snd0 \ +-enable-kvm \ +-msg timestamp=on + +# -netdev user,id=net0 \ +# -drive file=shared.img,index=1,media=disk,format=raw \ +# -netdev user,id=net0,hostfwd=tcp::60022-:22 \ +# -serial stdio +# -m 8192 \ +# -display sdl,gl=on,show-cursor=on,window-close=on \ +# -full-screen \ +# -audiodev pa,id=snd0 \ +# -net nic,vlan=0 -net user,vlan=0 +# -net nic,vlan=0 -net user,vlan=0 -netdev user,id=user.0 -device e1000,netdev=user.0 diff --git a/boot/melawy1-systemd-boot.sh b/boot/melawy1-systemd-boot.sh new file mode 100755 index 0000000..eb60784 --- /dev/null +++ b/boot/melawy1-systemd-boot.sh @@ -0,0 +1,71 @@ +#!/bin/bash + +name=$(basename -s .sh $0) + +numberofcores=$(grep -c ^processor /proc/cpuinfo) + +virt_cpu=$(( $numberofcores/2 )) +smp=$(( $virt_cpu / 2 )) +sockets=$(( $virt_cpu / 2 )) + +mem=$(expr $(cat /proc/meminfo | grep "MemFree" | awk '{print $2}') / 1024 - $(( 2 * 1024 )) ) + +if [[ $mem -lt 6144 ]]; then + mem=6144 +fi + +fd="$name-OVMF_VARS.fd" + +if [ ! -f "./fd/$fd" ]; then + cp -av -- '/usr/share/edk2-ovmf/x64/OVMF_VARS.fd' "./fd/$fd" +fi + +iso=$(find ./iso -name "*.iso" | grep -i "melawy" | tail -n 1) + +qcow2="$name.qcow2" + +if [ ! -f "./qcow2/$qcow2" ]; then + qemu-img create -f qcow2 "./qcow2/$qcow2" 50G +fi + +echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd" + +random_num=$((1 + $RANDOM % 100)) + +qemu-system-x86_64 \ +-name MelawyLinux_$random_num,process=archiso_$random_num,guest=MelawyLinux_$random_num,debug-threads=on \ +-drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \ +-drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \ +-global "driver=cfi.pflash01,property=secure,value=off" \ +-global ICH9-LPC.disable_s3=1 \ +-cdrom ${iso} \ +-drive file="./qcow2/$qcow2,index=0,media=disk,format=qcow2" \ +-boot order=d,menu=on,reboot-timeout=5000 \ +-smbios type=0,uefi=on \ +-smp $smp,sockets=$sockets,cores=1,threads=1 \ +-rtc base=utc,driftfix=slew \ +-cpu host,migratable=on \ +-m "size=$mem,slots=0,maxmem=$(($mem*1024*1024))" \ +-usb \ +-k en-us \ +-vga virtio \ +-display gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on \ +-audiodev pipewire,id=snd0 \ +-device ich9-intel-hda \ +-device hda-output,audiodev=snd0 \ +-device virtio-net-pci,romfile=,netdev=net0 \ +-netdev user,id=net0,hostfwd=tcp::60022-:22 \ +-machine type=pc-q35-8.1,smm=on,accel=kvm,usb=on,vmport=off,dump-guest-core=off,hpet=off,acpi=on,pcspk-audiodev=snd0 \ +-enable-kvm \ +-msg timestamp=on + +# -netdev user,id=net0 \ +# -drive file=shared.img,index=1,media=disk,format=raw \ +# -netdev user,id=net0,hostfwd=tcp::60022-:22 \ +# -serial stdio +# -m 8192 \ +# -display sdl,gl=on,show-cursor=on,window-close=on \ +# -full-screen \ +# -audiodev pa,id=snd0 \ +# -net nic,vlan=0 -net user,vlan=0 +# -net nic,vlan=0 -net user,vlan=0 -netdev user,id=user.0 -device e1000,netdev=user.0 diff --git a/boot/melawy2-grub2.sh b/boot/melawy2-grub2.sh new file mode 100755 index 0000000..eb60784 --- /dev/null +++ b/boot/melawy2-grub2.sh @@ -0,0 +1,71 @@ +#!/bin/bash + +name=$(basename -s .sh $0) + +numberofcores=$(grep -c ^processor /proc/cpuinfo) + +virt_cpu=$(( $numberofcores/2 )) +smp=$(( $virt_cpu / 2 )) +sockets=$(( $virt_cpu / 2 )) + +mem=$(expr $(cat /proc/meminfo | grep "MemFree" | awk '{print $2}') / 1024 - $(( 2 * 1024 )) ) + +if [[ $mem -lt 6144 ]]; then + mem=6144 +fi + +fd="$name-OVMF_VARS.fd" + +if [ ! -f "./fd/$fd" ]; then + cp -av -- '/usr/share/edk2-ovmf/x64/OVMF_VARS.fd' "./fd/$fd" +fi + +iso=$(find ./iso -name "*.iso" | grep -i "melawy" | tail -n 1) + +qcow2="$name.qcow2" + +if [ ! -f "./qcow2/$qcow2" ]; then + qemu-img create -f qcow2 "./qcow2/$qcow2" 50G +fi + +echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd" + +random_num=$((1 + $RANDOM % 100)) + +qemu-system-x86_64 \ +-name MelawyLinux_$random_num,process=archiso_$random_num,guest=MelawyLinux_$random_num,debug-threads=on \ +-drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \ +-drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \ +-global "driver=cfi.pflash01,property=secure,value=off" \ +-global ICH9-LPC.disable_s3=1 \ +-cdrom ${iso} \ +-drive file="./qcow2/$qcow2,index=0,media=disk,format=qcow2" \ +-boot order=d,menu=on,reboot-timeout=5000 \ +-smbios type=0,uefi=on \ +-smp $smp,sockets=$sockets,cores=1,threads=1 \ +-rtc base=utc,driftfix=slew \ +-cpu host,migratable=on \ +-m "size=$mem,slots=0,maxmem=$(($mem*1024*1024))" \ +-usb \ +-k en-us \ +-vga virtio \ +-display gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on \ +-audiodev pipewire,id=snd0 \ +-device ich9-intel-hda \ +-device hda-output,audiodev=snd0 \ +-device virtio-net-pci,romfile=,netdev=net0 \ +-netdev user,id=net0,hostfwd=tcp::60022-:22 \ +-machine type=pc-q35-8.1,smm=on,accel=kvm,usb=on,vmport=off,dump-guest-core=off,hpet=off,acpi=on,pcspk-audiodev=snd0 \ +-enable-kvm \ +-msg timestamp=on + +# -netdev user,id=net0 \ +# -drive file=shared.img,index=1,media=disk,format=raw \ +# -netdev user,id=net0,hostfwd=tcp::60022-:22 \ +# -serial stdio +# -m 8192 \ +# -display sdl,gl=on,show-cursor=on,window-close=on \ +# -full-screen \ +# -audiodev pa,id=snd0 \ +# -net nic,vlan=0 -net user,vlan=0 +# -net nic,vlan=0 -net user,vlan=0 -netdev user,id=user.0 -device e1000,netdev=user.0 diff --git a/boot/melawy2-refind.sh b/boot/melawy2-refind.sh new file mode 100755 index 0000000..eb60784 --- /dev/null +++ b/boot/melawy2-refind.sh @@ -0,0 +1,71 @@ +#!/bin/bash + +name=$(basename -s .sh $0) + +numberofcores=$(grep -c ^processor /proc/cpuinfo) + +virt_cpu=$(( $numberofcores/2 )) +smp=$(( $virt_cpu / 2 )) +sockets=$(( $virt_cpu / 2 )) + +mem=$(expr $(cat /proc/meminfo | grep "MemFree" | awk '{print $2}') / 1024 - $(( 2 * 1024 )) ) + +if [[ $mem -lt 6144 ]]; then + mem=6144 +fi + +fd="$name-OVMF_VARS.fd" + +if [ ! -f "./fd/$fd" ]; then + cp -av -- '/usr/share/edk2-ovmf/x64/OVMF_VARS.fd' "./fd/$fd" +fi + +iso=$(find ./iso -name "*.iso" | grep -i "melawy" | tail -n 1) + +qcow2="$name.qcow2" + +if [ ! -f "./qcow2/$qcow2" ]; then + qemu-img create -f qcow2 "./qcow2/$qcow2" 50G +fi + +echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd" + +random_num=$((1 + $RANDOM % 100)) + +qemu-system-x86_64 \ +-name MelawyLinux_$random_num,process=archiso_$random_num,guest=MelawyLinux_$random_num,debug-threads=on \ +-drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \ +-drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \ +-global "driver=cfi.pflash01,property=secure,value=off" \ +-global ICH9-LPC.disable_s3=1 \ +-cdrom ${iso} \ +-drive file="./qcow2/$qcow2,index=0,media=disk,format=qcow2" \ +-boot order=d,menu=on,reboot-timeout=5000 \ +-smbios type=0,uefi=on \ +-smp $smp,sockets=$sockets,cores=1,threads=1 \ +-rtc base=utc,driftfix=slew \ +-cpu host,migratable=on \ +-m "size=$mem,slots=0,maxmem=$(($mem*1024*1024))" \ +-usb \ +-k en-us \ +-vga virtio \ +-display gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on \ +-audiodev pipewire,id=snd0 \ +-device ich9-intel-hda \ +-device hda-output,audiodev=snd0 \ +-device virtio-net-pci,romfile=,netdev=net0 \ +-netdev user,id=net0,hostfwd=tcp::60022-:22 \ +-machine type=pc-q35-8.1,smm=on,accel=kvm,usb=on,vmport=off,dump-guest-core=off,hpet=off,acpi=on,pcspk-audiodev=snd0 \ +-enable-kvm \ +-msg timestamp=on + +# -netdev user,id=net0 \ +# -drive file=shared.img,index=1,media=disk,format=raw \ +# -netdev user,id=net0,hostfwd=tcp::60022-:22 \ +# -serial stdio +# -m 8192 \ +# -display sdl,gl=on,show-cursor=on,window-close=on \ +# -full-screen \ +# -audiodev pa,id=snd0 \ +# -net nic,vlan=0 -net user,vlan=0 +# -net nic,vlan=0 -net user,vlan=0 -netdev user,id=user.0 -device e1000,netdev=user.0 diff --git a/boot/melawy2-systemd-boot.sh b/boot/melawy2-systemd-boot.sh new file mode 100755 index 0000000..eb60784 --- /dev/null +++ b/boot/melawy2-systemd-boot.sh @@ -0,0 +1,71 @@ +#!/bin/bash + +name=$(basename -s .sh $0) + +numberofcores=$(grep -c ^processor /proc/cpuinfo) + +virt_cpu=$(( $numberofcores/2 )) +smp=$(( $virt_cpu / 2 )) +sockets=$(( $virt_cpu / 2 )) + +mem=$(expr $(cat /proc/meminfo | grep "MemFree" | awk '{print $2}') / 1024 - $(( 2 * 1024 )) ) + +if [[ $mem -lt 6144 ]]; then + mem=6144 +fi + +fd="$name-OVMF_VARS.fd" + +if [ ! -f "./fd/$fd" ]; then + cp -av -- '/usr/share/edk2-ovmf/x64/OVMF_VARS.fd' "./fd/$fd" +fi + +iso=$(find ./iso -name "*.iso" | grep -i "melawy" | tail -n 1) + +qcow2="$name.qcow2" + +if [ ! -f "./qcow2/$qcow2" ]; then + qemu-img create -f qcow2 "./qcow2/$qcow2" 50G +fi + +echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd" + +random_num=$((1 + $RANDOM % 100)) + +qemu-system-x86_64 \ +-name MelawyLinux_$random_num,process=archiso_$random_num,guest=MelawyLinux_$random_num,debug-threads=on \ +-drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \ +-drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \ +-global "driver=cfi.pflash01,property=secure,value=off" \ +-global ICH9-LPC.disable_s3=1 \ +-cdrom ${iso} \ +-drive file="./qcow2/$qcow2,index=0,media=disk,format=qcow2" \ +-boot order=d,menu=on,reboot-timeout=5000 \ +-smbios type=0,uefi=on \ +-smp $smp,sockets=$sockets,cores=1,threads=1 \ +-rtc base=utc,driftfix=slew \ +-cpu host,migratable=on \ +-m "size=$mem,slots=0,maxmem=$(($mem*1024*1024))" \ +-usb \ +-k en-us \ +-vga virtio \ +-display gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on \ +-audiodev pipewire,id=snd0 \ +-device ich9-intel-hda \ +-device hda-output,audiodev=snd0 \ +-device virtio-net-pci,romfile=,netdev=net0 \ +-netdev user,id=net0,hostfwd=tcp::60022-:22 \ +-machine type=pc-q35-8.1,smm=on,accel=kvm,usb=on,vmport=off,dump-guest-core=off,hpet=off,acpi=on,pcspk-audiodev=snd0 \ +-enable-kvm \ +-msg timestamp=on + +# -netdev user,id=net0 \ +# -drive file=shared.img,index=1,media=disk,format=raw \ +# -netdev user,id=net0,hostfwd=tcp::60022-:22 \ +# -serial stdio +# -m 8192 \ +# -display sdl,gl=on,show-cursor=on,window-close=on \ +# -full-screen \ +# -audiodev pa,id=snd0 \ +# -net nic,vlan=0 -net user,vlan=0 +# -net nic,vlan=0 -net user,vlan=0 -netdev user,id=user.0 -device e1000,netdev=user.0 diff --git a/.vscode/settings.json b/make_iso/.vscode/settings.json similarity index 100% rename from .vscode/settings.json rename to make_iso/.vscode/settings.json diff --git a/00_reset_light.sh b/make_iso/00_reset_light.sh similarity index 100% rename from 00_reset_light.sh rename to make_iso/00_reset_light.sh diff --git a/00_reset_with_packages.sh b/make_iso/00_reset_with_packages.sh similarity index 100% rename from 00_reset_with_packages.sh rename to make_iso/00_reset_with_packages.sh diff --git a/01_rank_mirrorlist.sh b/make_iso/01_rank_mirrorlist.sh similarity index 100% rename from 01_rank_mirrorlist.sh rename to make_iso/01_rank_mirrorlist.sh diff --git a/02_prepare.sh b/make_iso/02_prepare.sh similarity index 100% rename from 02_prepare.sh rename to make_iso/02_prepare.sh diff --git a/03_chown.sh b/make_iso/03_chown.sh similarity index 100% rename from 03_chown.sh rename to make_iso/03_chown.sh diff --git a/04_make.sh b/make_iso/04_make.sh similarity index 100% rename from 04_make.sh rename to make_iso/04_make.sh diff --git a/05_sign.sh b/make_iso/05_sign.sh similarity index 100% rename from 05_sign.sh rename to make_iso/05_sign.sh diff --git a/06_chown.sh b/make_iso/06_chown.sh similarity index 100% rename from 06_chown.sh rename to make_iso/06_chown.sh diff --git a/LICENSE b/make_iso/LICENSE similarity index 100% rename from LICENSE rename to make_iso/LICENSE diff --git a/airootfs/etc/NetworkManager/NetworkManager.conf b/make_iso/airootfs/etc/NetworkManager/NetworkManager.conf similarity index 100% rename from airootfs/etc/NetworkManager/NetworkManager.conf rename to make_iso/airootfs/etc/NetworkManager/NetworkManager.conf diff --git a/airootfs/etc/NetworkManager/dispatcher.d/09-timezone b/make_iso/airootfs/etc/NetworkManager/dispatcher.d/09-timezone similarity index 100% rename from airootfs/etc/NetworkManager/dispatcher.d/09-timezone rename to make_iso/airootfs/etc/NetworkManager/dispatcher.d/09-timezone diff --git a/airootfs/etc/X11/xorg.conf.d/30-touchpad.conf b/make_iso/airootfs/etc/X11/xorg.conf.d/30-touchpad.conf similarity index 100% rename from airootfs/etc/X11/xorg.conf.d/30-touchpad.conf rename to make_iso/airootfs/etc/X11/xorg.conf.d/30-touchpad.conf diff --git a/airootfs/etc/dracut.conf.d/defaults.conf b/make_iso/airootfs/etc/dracut.conf.d/defaults.conf similarity index 100% rename from airootfs/etc/dracut.conf.d/defaults.conf rename to make_iso/airootfs/etc/dracut.conf.d/defaults.conf diff --git a/airootfs/etc/environment b/make_iso/airootfs/etc/environment similarity index 100% rename from airootfs/etc/environment rename to make_iso/airootfs/etc/environment diff --git a/airootfs/etc/fonts/local.conf b/make_iso/airootfs/etc/fonts/local.conf similarity index 100% rename from airootfs/etc/fonts/local.conf rename to make_iso/airootfs/etc/fonts/local.conf diff --git a/airootfs/etc/group b/make_iso/airootfs/etc/group similarity index 100% rename from airootfs/etc/group rename to make_iso/airootfs/etc/group diff --git a/airootfs/etc/gshadow b/make_iso/airootfs/etc/gshadow similarity index 100% rename from airootfs/etc/gshadow rename to make_iso/airootfs/etc/gshadow diff --git a/airootfs/etc/hostname b/make_iso/airootfs/etc/hostname similarity index 100% rename from airootfs/etc/hostname rename to make_iso/airootfs/etc/hostname diff --git a/airootfs/etc/issue b/make_iso/airootfs/etc/issue similarity index 100% rename from airootfs/etc/issue rename to make_iso/airootfs/etc/issue diff --git a/airootfs/etc/locale.conf b/make_iso/airootfs/etc/locale.conf similarity index 100% rename from airootfs/etc/locale.conf rename to make_iso/airootfs/etc/locale.conf diff --git a/airootfs/etc/locale.gen b/make_iso/airootfs/etc/locale.gen similarity index 100% rename from airootfs/etc/locale.gen rename to make_iso/airootfs/etc/locale.gen diff --git a/airootfs/etc/localtime b/make_iso/airootfs/etc/localtime similarity index 100% rename from airootfs/etc/localtime rename to make_iso/airootfs/etc/localtime diff --git a/airootfs/etc/machine-id b/make_iso/airootfs/etc/machine-id similarity index 100% rename from airootfs/etc/machine-id rename to make_iso/airootfs/etc/machine-id diff --git a/airootfs/etc/makepkg.conf b/make_iso/airootfs/etc/makepkg.conf similarity index 100% rename from airootfs/etc/makepkg.conf rename to make_iso/airootfs/etc/makepkg.conf diff --git a/airootfs/etc/mkinitcpio.conf b/make_iso/airootfs/etc/mkinitcpio.conf similarity index 100% rename from airootfs/etc/mkinitcpio.conf rename to make_iso/airootfs/etc/mkinitcpio.conf diff --git a/airootfs/etc/mkinitcpio.d/linux-hardened.preset b/make_iso/airootfs/etc/mkinitcpio.d/linux-hardened.preset similarity index 100% rename from airootfs/etc/mkinitcpio.d/linux-hardened.preset rename to make_iso/airootfs/etc/mkinitcpio.d/linux-hardened.preset diff --git a/airootfs/etc/mkinitcpio.d/linux-xanmod.preset b/make_iso/airootfs/etc/mkinitcpio.d/linux-xanmod.preset similarity index 100% rename from airootfs/etc/mkinitcpio.d/linux-xanmod.preset rename to make_iso/airootfs/etc/mkinitcpio.d/linux-xanmod.preset diff --git a/airootfs/etc/modprobe.d/broadcom-wl.conf b/make_iso/airootfs/etc/modprobe.d/broadcom-wl.conf similarity index 100% rename from airootfs/etc/modprobe.d/broadcom-wl.conf rename to make_iso/airootfs/etc/modprobe.d/broadcom-wl.conf diff --git a/airootfs/etc/modprobe.d/iwlwifi.conf b/make_iso/airootfs/etc/modprobe.d/iwlwifi.conf similarity index 100% rename from airootfs/etc/modprobe.d/iwlwifi.conf rename to make_iso/airootfs/etc/modprobe.d/iwlwifi.conf diff --git a/airootfs/etc/modprobe.d/nvidia-utils.conf b/make_iso/airootfs/etc/modprobe.d/nvidia-utils.conf similarity index 100% rename from airootfs/etc/modprobe.d/nvidia-utils.conf rename to make_iso/airootfs/etc/modprobe.d/nvidia-utils.conf diff --git a/airootfs/etc/modules-load.d/nvidia-utils.conf b/make_iso/airootfs/etc/modules-load.d/nvidia-utils.conf similarity index 100% rename from airootfs/etc/modules-load.d/nvidia-utils.conf rename to make_iso/airootfs/etc/modules-load.d/nvidia-utils.conf diff --git a/airootfs/etc/modules-load.d/zfs.conf b/make_iso/airootfs/etc/modules-load.d/zfs.conf similarity index 100% rename from airootfs/etc/modules-load.d/zfs.conf rename to make_iso/airootfs/etc/modules-load.d/zfs.conf diff --git a/airootfs/etc/motd b/make_iso/airootfs/etc/motd similarity index 100% rename from airootfs/etc/motd rename to make_iso/airootfs/etc/motd diff --git a/airootfs/etc/nsswitch.conf b/make_iso/airootfs/etc/nsswitch.conf similarity index 100% rename from airootfs/etc/nsswitch.conf rename to make_iso/airootfs/etc/nsswitch.conf diff --git a/airootfs/etc/pacman-cache.conf b/make_iso/airootfs/etc/pacman-cache.conf similarity index 100% rename from airootfs/etc/pacman-cache.conf rename to make_iso/airootfs/etc/pacman-cache.conf diff --git a/airootfs/etc/pacman-std.conf b/make_iso/airootfs/etc/pacman-std.conf similarity index 100% rename from airootfs/etc/pacman-std.conf rename to make_iso/airootfs/etc/pacman-std.conf diff --git a/airootfs/etc/pacman.conf b/make_iso/airootfs/etc/pacman.conf similarity index 100% rename from airootfs/etc/pacman.conf rename to make_iso/airootfs/etc/pacman.conf diff --git a/airootfs/etc/pacman.d/gnupg/gpg.conf b/make_iso/airootfs/etc/pacman.d/gnupg/gpg.conf similarity index 100% rename from airootfs/etc/pacman.d/gnupg/gpg.conf rename to make_iso/airootfs/etc/pacman.d/gnupg/gpg.conf diff --git a/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook b/make_iso/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook similarity index 100% rename from airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook rename to make_iso/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook diff --git a/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook b/make_iso/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook similarity index 100% rename from airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook rename to make_iso/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook diff --git a/airootfs/etc/pacman.d/mirrorlist b/make_iso/airootfs/etc/pacman.d/mirrorlist similarity index 100% rename from airootfs/etc/pacman.d/mirrorlist rename to make_iso/airootfs/etc/pacman.d/mirrorlist diff --git a/airootfs/etc/pamac.conf b/make_iso/airootfs/etc/pamac.conf similarity index 100% rename from airootfs/etc/pamac.conf rename to make_iso/airootfs/etc/pamac.conf diff --git a/airootfs/etc/passwd b/make_iso/airootfs/etc/passwd similarity index 100% rename from airootfs/etc/passwd rename to make_iso/airootfs/etc/passwd diff --git a/airootfs/etc/plymouth/plymouthd.conf b/make_iso/airootfs/etc/plymouth/plymouthd.conf similarity index 100% rename from airootfs/etc/plymouth/plymouthd.conf rename to make_iso/airootfs/etc/plymouth/plymouthd.conf diff --git a/airootfs/etc/polkit-1/rules.d/10-timedate.rules b/make_iso/airootfs/etc/polkit-1/rules.d/10-timedate.rules similarity index 100% rename from airootfs/etc/polkit-1/rules.d/10-timedate.rules rename to make_iso/airootfs/etc/polkit-1/rules.d/10-timedate.rules diff --git a/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules b/make_iso/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules similarity index 100% rename from airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules rename to make_iso/airootfs/etc/polkit-1/rules.d/49-nopasswd_global.rules diff --git a/airootfs/etc/refind-menu-generator/theme.conf b/make_iso/airootfs/etc/refind-menu-generator/theme.conf similarity index 100% rename from airootfs/etc/refind-menu-generator/theme.conf rename to make_iso/airootfs/etc/refind-menu-generator/theme.conf diff --git a/airootfs/etc/reflector-simple.conf b/make_iso/airootfs/etc/reflector-simple.conf similarity index 100% rename from airootfs/etc/reflector-simple.conf rename to make_iso/airootfs/etc/reflector-simple.conf diff --git a/airootfs/etc/resolv.conf b/make_iso/airootfs/etc/resolv.conf similarity index 100% rename from airootfs/etc/resolv.conf rename to make_iso/airootfs/etc/resolv.conf diff --git a/airootfs/etc/sddm.conf b/make_iso/airootfs/etc/sddm.conf similarity index 100% rename from airootfs/etc/sddm.conf rename to make_iso/airootfs/etc/sddm.conf diff --git a/airootfs/etc/sddm.conf.d/kde_settings.conf b/make_iso/airootfs/etc/sddm.conf.d/kde_settings.conf similarity index 100% rename from airootfs/etc/sddm.conf.d/kde_settings.conf rename to make_iso/airootfs/etc/sddm.conf.d/kde_settings.conf diff --git a/airootfs/etc/shadow b/make_iso/airootfs/etc/shadow similarity index 100% rename from airootfs/etc/shadow rename to make_iso/airootfs/etc/shadow diff --git a/airootfs/etc/skel/.Xresources b/make_iso/airootfs/etc/skel/.Xresources similarity index 100% rename from airootfs/etc/skel/.Xresources rename to make_iso/airootfs/etc/skel/.Xresources diff --git a/airootfs/etc/skel/.bashrc b/make_iso/airootfs/etc/skel/.bashrc similarity index 100% rename from airootfs/etc/skel/.bashrc rename to make_iso/airootfs/etc/skel/.bashrc diff --git a/airootfs/etc/ssh/sshd_config.d/10-archiso.conf b/make_iso/airootfs/etc/ssh/sshd_config.d/10-archiso.conf similarity index 100% rename from airootfs/etc/ssh/sshd_config.d/10-archiso.conf rename to make_iso/airootfs/etc/ssh/sshd_config.d/10-archiso.conf diff --git a/airootfs/etc/sudoers.d/g_wheel b/make_iso/airootfs/etc/sudoers.d/g_wheel similarity index 100% rename from airootfs/etc/sudoers.d/g_wheel rename to make_iso/airootfs/etc/sudoers.d/g_wheel diff --git a/airootfs/etc/sysctl.d/99-local.conf b/make_iso/airootfs/etc/sysctl.d/99-local.conf similarity index 100% rename from airootfs/etc/sysctl.d/99-local.conf rename to make_iso/airootfs/etc/sysctl.d/99-local.conf diff --git a/airootfs/etc/systemd/journald.conf b/make_iso/airootfs/etc/systemd/journald.conf similarity index 100% rename from airootfs/etc/systemd/journald.conf rename to make_iso/airootfs/etc/systemd/journald.conf diff --git a/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf b/make_iso/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf similarity index 100% rename from airootfs/etc/systemd/journald.conf.d/volatile-storage.conf rename to make_iso/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf diff --git a/airootfs/etc/systemd/logind.conf b/make_iso/airootfs/etc/systemd/logind.conf similarity index 100% rename from airootfs/etc/systemd/logind.conf rename to make_iso/airootfs/etc/systemd/logind.conf diff --git a/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf b/make_iso/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf similarity index 100% rename from airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf rename to make_iso/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf diff --git a/airootfs/etc/systemd/network/20-ethernet.network b/make_iso/airootfs/etc/systemd/network/20-ethernet.network similarity index 100% rename from airootfs/etc/systemd/network/20-ethernet.network rename to make_iso/airootfs/etc/systemd/network/20-ethernet.network diff --git a/airootfs/etc/systemd/network/20-wlan.network b/make_iso/airootfs/etc/systemd/network/20-wlan.network similarity index 100% rename from airootfs/etc/systemd/network/20-wlan.network rename to make_iso/airootfs/etc/systemd/network/20-wlan.network diff --git a/airootfs/etc/systemd/network/20-wwan.network b/make_iso/airootfs/etc/systemd/network/20-wwan.network similarity index 100% rename from airootfs/etc/systemd/network/20-wwan.network rename to make_iso/airootfs/etc/systemd/network/20-wwan.network diff --git a/airootfs/etc/systemd/resolved.conf.d/archiso.conf b/make_iso/airootfs/etc/systemd/resolved.conf.d/archiso.conf similarity index 100% rename from airootfs/etc/systemd/resolved.conf.d/archiso.conf rename to make_iso/airootfs/etc/systemd/resolved.conf.d/archiso.conf diff --git a/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator b/make_iso/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator similarity index 100% rename from airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator rename to make_iso/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator diff --git a/airootfs/etc/systemd/system/bluetooth.target.wants/bluetooth.service b/make_iso/airootfs/etc/systemd/system/bluetooth.target.wants/bluetooth.service similarity index 100% rename from airootfs/etc/systemd/system/bluetooth.target.wants/bluetooth.service rename to make_iso/airootfs/etc/systemd/system/bluetooth.target.wants/bluetooth.service diff --git a/airootfs/etc/systemd/system/choose-mirror.service b/make_iso/airootfs/etc/systemd/system/choose-mirror.service similarity index 100% rename from airootfs/etc/systemd/system/choose-mirror.service rename to make_iso/airootfs/etc/systemd/system/choose-mirror.service diff --git a/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service b/make_iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service similarity index 100% rename from airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service rename to make_iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service diff --git a/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service b/make_iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service similarity index 100% rename from airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service rename to make_iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service diff --git a/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service b/make_iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service similarity index 100% rename from airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service rename to make_iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service diff --git a/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service b/make_iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service similarity index 100% rename from airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service rename to make_iso/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service diff --git a/airootfs/etc/systemd/system/dbus-fi.w1.wpa_supplicant1.service b/make_iso/airootfs/etc/systemd/system/dbus-fi.w1.wpa_supplicant1.service similarity index 100% rename from airootfs/etc/systemd/system/dbus-fi.w1.wpa_supplicant1.service rename to make_iso/airootfs/etc/systemd/system/dbus-fi.w1.wpa_supplicant1.service diff --git a/airootfs/etc/systemd/system/dbus-org.bluez.service b/make_iso/airootfs/etc/systemd/system/dbus-org.bluez.service similarity index 100% rename from airootfs/etc/systemd/system/dbus-org.bluez.service rename to make_iso/airootfs/etc/systemd/system/dbus-org.bluez.service diff --git a/airootfs/etc/systemd/system/dbus-org.freedesktop.Avahi.service b/make_iso/airootfs/etc/systemd/system/dbus-org.freedesktop.Avahi.service similarity index 100% rename from airootfs/etc/systemd/system/dbus-org.freedesktop.Avahi.service rename to make_iso/airootfs/etc/systemd/system/dbus-org.freedesktop.Avahi.service diff --git a/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service b/make_iso/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service similarity index 100% rename from airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service rename to make_iso/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service diff --git a/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service b/make_iso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service similarity index 100% rename from airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service rename to make_iso/airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service diff --git a/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service b/make_iso/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service similarity index 100% rename from airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service rename to make_iso/airootfs/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service diff --git a/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service b/make_iso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service similarity index 100% rename from airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service rename to make_iso/airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service diff --git a/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service b/make_iso/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service similarity index 100% rename from airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service rename to make_iso/airootfs/etc/systemd/system/dbus-org.freedesktop.timesync1.service diff --git a/airootfs/etc/systemd/system/default.target b/make_iso/airootfs/etc/systemd/system/default.target similarity index 100% rename from airootfs/etc/systemd/system/default.target rename to make_iso/airootfs/etc/systemd/system/default.target diff --git a/airootfs/etc/systemd/system/display-manager.service b/make_iso/airootfs/etc/systemd/system/display-manager.service similarity index 100% rename from airootfs/etc/systemd/system/display-manager.service rename to make_iso/airootfs/etc/systemd/system/display-manager.service diff --git a/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount b/make_iso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount similarity index 100% rename from airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount rename to make_iso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount diff --git a/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/make_iso/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf similarity index 100% rename from airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf rename to make_iso/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf diff --git a/airootfs/etc/systemd/system/intel.service b/make_iso/airootfs/etc/systemd/system/intel.service similarity index 100% rename from airootfs/etc/systemd/system/intel.service rename to make_iso/airootfs/etc/systemd/system/intel.service diff --git a/airootfs/etc/systemd/system/livecd-alsa-unmuter.service b/make_iso/airootfs/etc/systemd/system/livecd-alsa-unmuter.service similarity index 100% rename from airootfs/etc/systemd/system/livecd-alsa-unmuter.service rename to make_iso/airootfs/etc/systemd/system/livecd-alsa-unmuter.service diff --git a/airootfs/etc/systemd/system/livecd-talk.service b/make_iso/airootfs/etc/systemd/system/livecd-talk.service similarity index 100% rename from airootfs/etc/systemd/system/livecd-talk.service rename to make_iso/airootfs/etc/systemd/system/livecd-talk.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/avahi-daemon.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/avahi-daemon.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/avahi-daemon.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/avahi-daemon.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/bluetooth.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/bluetooth.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/bluetooth.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/bluetooth.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/choose-mirror.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/firewalld.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/firewalld.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/firewalld.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/firewalld.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/intel.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/intel.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/intel.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/intel.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/iwd.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/ntpd.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/ntpd.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/ntpd.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/ntpd.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/pacman-init.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/pacman-init.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/pacman-init.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/pacman-init.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/pamac-cleancache.timer b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/pamac-cleancache.timer similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/pamac-cleancache.timer rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/pamac-cleancache.timer diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/reflector.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/reflector.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/reflector.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/reflector.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/remote-fs.target b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/remote-fs.target similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/remote-fs.target rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/remote-fs.target diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/spice-vdagentd.socket b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/spice-vdagentd.socket similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/spice-vdagentd.socket rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/spice-vdagentd.socket diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/sshd.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/vboxclient.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/vboxclient.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/vboxclient.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/vboxclient.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/vcheck.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/vcheck.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/vcheck.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/vcheck.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service diff --git a/airootfs/etc/systemd/system/multi-user.target.wants/wpa_supplicant.service b/make_iso/airootfs/etc/systemd/system/multi-user.target.wants/wpa_supplicant.service similarity index 100% rename from airootfs/etc/systemd/system/multi-user.target.wants/wpa_supplicant.service rename to make_iso/airootfs/etc/systemd/system/multi-user.target.wants/wpa_supplicant.service diff --git a/airootfs/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service b/make_iso/airootfs/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service similarity index 100% rename from airootfs/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service rename to make_iso/airootfs/etc/systemd/system/network-online.target.wants/NetworkManager-wait-online.service diff --git a/airootfs/etc/systemd/system/pacman-init.service b/make_iso/airootfs/etc/systemd/system/pacman-init.service similarity index 100% rename from airootfs/etc/systemd/system/pacman-init.service rename to make_iso/airootfs/etc/systemd/system/pacman-init.service diff --git a/airootfs/etc/systemd/system/reflector.service.d/archiso.conf b/make_iso/airootfs/etc/systemd/system/reflector.service.d/archiso.conf similarity index 100% rename from airootfs/etc/systemd/system/reflector.service.d/archiso.conf rename to make_iso/airootfs/etc/systemd/system/reflector.service.d/archiso.conf diff --git a/airootfs/etc/systemd/system/sockets.target.wants/avahi-daemon.socket b/make_iso/airootfs/etc/systemd/system/sockets.target.wants/avahi-daemon.socket similarity index 100% rename from airootfs/etc/systemd/system/sockets.target.wants/avahi-daemon.socket rename to make_iso/airootfs/etc/systemd/system/sockets.target.wants/avahi-daemon.socket diff --git a/airootfs/etc/systemd/system/sockets.target.wants/pcscd.socket b/make_iso/airootfs/etc/systemd/system/sockets.target.wants/pcscd.socket similarity index 100% rename from airootfs/etc/systemd/system/sockets.target.wants/pcscd.socket rename to make_iso/airootfs/etc/systemd/system/sockets.target.wants/pcscd.socket diff --git a/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/make_iso/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket similarity index 100% rename from airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket rename to make_iso/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket diff --git a/airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service b/make_iso/airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service similarity index 100% rename from airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service rename to make_iso/airootfs/etc/systemd/system/sound.target.wants/livecd-alsa-unmuter.service diff --git a/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service b/make_iso/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service similarity index 100% rename from airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service rename to make_iso/airootfs/etc/systemd/system/sysinit.target.wants/systemd-time-wait-sync.service diff --git a/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service b/make_iso/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service similarity index 100% rename from airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service rename to make_iso/airootfs/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service diff --git a/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/make_iso/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf similarity index 100% rename from airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf rename to make_iso/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf diff --git a/airootfs/etc/systemd/timesyncd.conf b/make_iso/airootfs/etc/systemd/timesyncd.conf similarity index 100% rename from airootfs/etc/systemd/timesyncd.conf rename to make_iso/airootfs/etc/systemd/timesyncd.conf diff --git a/airootfs/etc/vconsole.conf b/make_iso/airootfs/etc/vconsole.conf similarity index 100% rename from airootfs/etc/vconsole.conf rename to make_iso/airootfs/etc/vconsole.conf diff --git a/airootfs/etc/xdg/reflector/reflector.conf b/make_iso/airootfs/etc/xdg/reflector/reflector.conf similarity index 100% rename from airootfs/etc/xdg/reflector/reflector.conf rename to make_iso/airootfs/etc/xdg/reflector/reflector.conf diff --git a/airootfs/opt/extra-drivers/packages_here b/make_iso/airootfs/opt/extra-drivers/packages_here similarity index 100% rename from airootfs/opt/extra-drivers/packages_here rename to make_iso/airootfs/opt/extra-drivers/packages_here diff --git a/airootfs/root/.automated_script.sh b/make_iso/airootfs/root/.automated_script.sh similarity index 100% rename from airootfs/root/.automated_script.sh rename to make_iso/airootfs/root/.automated_script.sh diff --git a/airootfs/root/.gnupg/scdaemon.conf b/make_iso/airootfs/root/.gnupg/scdaemon.conf similarity index 100% rename from airootfs/root/.gnupg/scdaemon.conf rename to make_iso/airootfs/root/.gnupg/scdaemon.conf diff --git a/airootfs/root/.zlogin b/make_iso/airootfs/root/.zlogin similarity index 100% rename from airootfs/root/.zlogin rename to make_iso/airootfs/root/.zlogin diff --git a/airootfs/root/archives/README b/make_iso/airootfs/root/archives/README similarity index 100% rename from airootfs/root/archives/README rename to make_iso/airootfs/root/archives/README diff --git a/airootfs/root/customize_airootfs.sh b/make_iso/airootfs/root/customize_airootfs.sh similarity index 100% rename from airootfs/root/customize_airootfs.sh rename to make_iso/airootfs/root/customize_airootfs.sh diff --git a/airootfs/root/packages/README b/make_iso/airootfs/root/packages/README similarity index 100% rename from airootfs/root/packages/README rename to make_iso/airootfs/root/packages/README diff --git a/airootfs/usr/bin/GPU-Intel-installer b/make_iso/airootfs/usr/bin/GPU-Intel-installer similarity index 100% rename from airootfs/usr/bin/GPU-Intel-installer rename to make_iso/airootfs/usr/bin/GPU-Intel-installer diff --git a/airootfs/usr/local/bin/Installation_guide b/make_iso/airootfs/usr/local/bin/Installation_guide similarity index 100% rename from airootfs/usr/local/bin/Installation_guide rename to make_iso/airootfs/usr/local/bin/Installation_guide diff --git a/airootfs/usr/local/bin/calamares-offline b/make_iso/airootfs/usr/local/bin/calamares-offline similarity index 100% rename from airootfs/usr/local/bin/calamares-offline rename to make_iso/airootfs/usr/local/bin/calamares-offline diff --git a/airootfs/usr/local/bin/calamares-online b/make_iso/airootfs/usr/local/bin/calamares-online similarity index 100% rename from airootfs/usr/local/bin/calamares-online rename to make_iso/airootfs/usr/local/bin/calamares-online diff --git a/airootfs/usr/local/bin/choose-mirror b/make_iso/airootfs/usr/local/bin/choose-mirror similarity index 100% rename from airootfs/usr/local/bin/choose-mirror rename to make_iso/airootfs/usr/local/bin/choose-mirror diff --git a/airootfs/usr/local/bin/chrooted-cleaner-script b/make_iso/airootfs/usr/local/bin/chrooted-cleaner-script similarity index 100% rename from airootfs/usr/local/bin/chrooted-cleaner-script rename to make_iso/airootfs/usr/local/bin/chrooted-cleaner-script diff --git a/airootfs/usr/local/bin/cleaner-script b/make_iso/airootfs/usr/local/bin/cleaner-script similarity index 100% rename from airootfs/usr/local/bin/cleaner-script rename to make_iso/airootfs/usr/local/bin/cleaner-script diff --git a/airootfs/usr/local/bin/connection-checker b/make_iso/airootfs/usr/local/bin/connection-checker similarity index 100% rename from airootfs/usr/local/bin/connection-checker rename to make_iso/airootfs/usr/local/bin/connection-checker diff --git a/airootfs/usr/local/bin/copy-refind-theme_v1 b/make_iso/airootfs/usr/local/bin/copy-refind-theme_v1 similarity index 100% rename from airootfs/usr/local/bin/copy-refind-theme_v1 rename to make_iso/airootfs/usr/local/bin/copy-refind-theme_v1 diff --git a/airootfs/usr/local/bin/copy-refind-theme_v2 b/make_iso/airootfs/usr/local/bin/copy-refind-theme_v2 similarity index 100% rename from airootfs/usr/local/bin/copy-refind-theme_v2 rename to make_iso/airootfs/usr/local/bin/copy-refind-theme_v2 diff --git a/airootfs/usr/local/bin/create-pacman-keyring b/make_iso/airootfs/usr/local/bin/create-pacman-keyring similarity index 100% rename from airootfs/usr/local/bin/create-pacman-keyring rename to make_iso/airootfs/usr/local/bin/create-pacman-keyring diff --git a/airootfs/usr/local/bin/dmcheck b/make_iso/airootfs/usr/local/bin/dmcheck similarity index 100% rename from airootfs/usr/local/bin/dmcheck rename to make_iso/airootfs/usr/local/bin/dmcheck diff --git a/airootfs/usr/local/bin/fix-key b/make_iso/airootfs/usr/local/bin/fix-key similarity index 100% rename from airootfs/usr/local/bin/fix-key rename to make_iso/airootfs/usr/local/bin/fix-key diff --git a/airootfs/usr/local/bin/fix-keys b/make_iso/airootfs/usr/local/bin/fix-keys similarity index 100% rename from airootfs/usr/local/bin/fix-keys rename to make_iso/airootfs/usr/local/bin/fix-keys diff --git a/airootfs/usr/local/bin/fixkey b/make_iso/airootfs/usr/local/bin/fixkey similarity index 100% rename from airootfs/usr/local/bin/fixkey rename to make_iso/airootfs/usr/local/bin/fixkey diff --git a/airootfs/usr/local/bin/fixkeys b/make_iso/airootfs/usr/local/bin/fixkeys similarity index 100% rename from airootfs/usr/local/bin/fixkeys rename to make_iso/airootfs/usr/local/bin/fixkeys diff --git a/airootfs/usr/local/bin/livecd-sound b/make_iso/airootfs/usr/local/bin/livecd-sound similarity index 100% rename from airootfs/usr/local/bin/livecd-sound rename to make_iso/airootfs/usr/local/bin/livecd-sound diff --git a/airootfs/usr/local/bin/online-install-nvidia-drivers b/make_iso/airootfs/usr/local/bin/online-install-nvidia-drivers similarity index 100% rename from airootfs/usr/local/bin/online-install-nvidia-drivers rename to make_iso/airootfs/usr/local/bin/online-install-nvidia-drivers diff --git a/airootfs/usr/local/bin/prepare-live-desktop b/make_iso/airootfs/usr/local/bin/prepare-live-desktop similarity index 100% rename from airootfs/usr/local/bin/prepare-live-desktop rename to make_iso/airootfs/usr/local/bin/prepare-live-desktop diff --git a/airootfs/usr/local/bin/remove-ucode b/make_iso/airootfs/usr/local/bin/remove-ucode similarity index 100% rename from airootfs/usr/local/bin/remove-ucode rename to make_iso/airootfs/usr/local/bin/remove-ucode diff --git a/airootfs/usr/local/bin/remove-unneeded b/make_iso/airootfs/usr/local/bin/remove-unneeded similarity index 100% rename from airootfs/usr/local/bin/remove-unneeded rename to make_iso/airootfs/usr/local/bin/remove-unneeded diff --git a/airootfs/usr/local/bin/update-mirrorlist b/make_iso/airootfs/usr/local/bin/update-mirrorlist similarity index 100% rename from airootfs/usr/local/bin/update-mirrorlist rename to make_iso/airootfs/usr/local/bin/update-mirrorlist diff --git a/airootfs/usr/local/share/livecd-sound/asound.conf.in b/make_iso/airootfs/usr/local/share/livecd-sound/asound.conf.in similarity index 100% rename from airootfs/usr/local/share/livecd-sound/asound.conf.in rename to make_iso/airootfs/usr/local/share/livecd-sound/asound.conf.in diff --git a/airootfs/usr/share/X11/xorg.conf.d/30-touchpad.conf b/make_iso/airootfs/usr/share/X11/xorg.conf.d/30-touchpad.conf similarity index 100% rename from airootfs/usr/share/X11/xorg.conf.d/30-touchpad.conf rename to make_iso/airootfs/usr/share/X11/xorg.conf.d/30-touchpad.conf diff --git a/airootfs/usr/share/packages/packages_here b/make_iso/airootfs/usr/share/packages/packages_here similarity index 100% rename from airootfs/usr/share/packages/packages_here rename to make_iso/airootfs/usr/share/packages/packages_here diff --git a/bootstrap_packages.x86_64 b/make_iso/bootstrap_packages.x86_64 similarity index 100% rename from bootstrap_packages.x86_64 rename to make_iso/bootstrap_packages.x86_64 diff --git a/efiboot/MokManager.efi b/make_iso/efiboot/MokManager.efi similarity index 100% rename from efiboot/MokManager.efi rename to make_iso/efiboot/MokManager.efi diff --git a/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/make_iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf similarity index 100% rename from efiboot/loader/entries/01-archiso-x86_64-linux.conf rename to make_iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf diff --git a/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf b/make_iso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf similarity index 100% rename from efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf rename to make_iso/efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf diff --git a/efiboot/loader/entries/03-archiso-x86_64-efi.conf b/make_iso/efiboot/loader/entries/03-archiso-x86_64-efi.conf similarity index 100% rename from efiboot/loader/entries/03-archiso-x86_64-efi.conf rename to make_iso/efiboot/loader/entries/03-archiso-x86_64-efi.conf diff --git a/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf b/make_iso/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf similarity index 100% rename from efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf rename to make_iso/efiboot/loader/entries/04-archiso-x86_64-efi-nv.conf diff --git a/efiboot/loader/loader.conf b/make_iso/efiboot/loader/loader.conf similarity index 100% rename from efiboot/loader/loader.conf rename to make_iso/efiboot/loader/loader.conf diff --git a/generate_packages.x86_64_from_netinstall.py b/make_iso/generate_packages.x86_64_from_netinstall.py similarity index 100% rename from generate_packages.x86_64_from_netinstall.py rename to make_iso/generate_packages.x86_64_from_netinstall.py diff --git a/grub/grub.cfg b/make_iso/grub/grub.cfg similarity index 100% rename from grub/grub.cfg rename to make_iso/grub/grub.cfg diff --git a/info/info.sh b/make_iso/info/info.sh similarity index 100% rename from info/info.sh rename to make_iso/info/info.sh diff --git a/info/packages.x86_64 b/make_iso/info/packages.x86_64 similarity index 100% rename from info/packages.x86_64 rename to make_iso/info/packages.x86_64 diff --git a/mkarchiso_last_my b/make_iso/mkarchiso_last_my similarity index 100% rename from mkarchiso_last_my rename to make_iso/mkarchiso_last_my diff --git a/netinstall.yaml b/make_iso/netinstall.yaml similarity index 100% rename from netinstall.yaml rename to make_iso/netinstall.yaml diff --git a/packages.x86_64 b/make_iso/packages.x86_64 similarity index 100% rename from packages.x86_64 rename to make_iso/packages.x86_64 diff --git a/packages.x86_64.max b/make_iso/packages.x86_64.max similarity index 100% rename from packages.x86_64.max rename to make_iso/packages.x86_64.max diff --git a/packages.x86_64.min b/make_iso/packages.x86_64.min similarity index 100% rename from packages.x86_64.min rename to make_iso/packages.x86_64.min diff --git a/pacman_sys.conf b/make_iso/pacman_sys.conf similarity index 100% rename from pacman_sys.conf rename to make_iso/pacman_sys.conf diff --git a/profiledef.sh b/make_iso/profiledef.sh similarity index 100% rename from profiledef.sh rename to make_iso/profiledef.sh diff --git a/syslinux/archiso_head.cfg b/make_iso/syslinux/archiso_head.cfg similarity index 100% rename from syslinux/archiso_head.cfg rename to make_iso/syslinux/archiso_head.cfg diff --git a/syslinux/archiso_pxe-linux.cfg b/make_iso/syslinux/archiso_pxe-linux.cfg similarity index 100% rename from syslinux/archiso_pxe-linux.cfg rename to make_iso/syslinux/archiso_pxe-linux.cfg diff --git a/syslinux/archiso_pxe.cfg b/make_iso/syslinux/archiso_pxe.cfg similarity index 100% rename from syslinux/archiso_pxe.cfg rename to make_iso/syslinux/archiso_pxe.cfg diff --git a/syslinux/archiso_sys-linux.cfg b/make_iso/syslinux/archiso_sys-linux.cfg similarity index 100% rename from syslinux/archiso_sys-linux.cfg rename to make_iso/syslinux/archiso_sys-linux.cfg diff --git a/syslinux/archiso_sys.cfg b/make_iso/syslinux/archiso_sys.cfg similarity index 100% rename from syslinux/archiso_sys.cfg rename to make_iso/syslinux/archiso_sys.cfg diff --git a/syslinux/archiso_tail.cfg b/make_iso/syslinux/archiso_tail.cfg similarity index 100% rename from syslinux/archiso_tail.cfg rename to make_iso/syslinux/archiso_tail.cfg diff --git a/syslinux/splash.png b/make_iso/syslinux/splash.png similarity index 100% rename from syslinux/splash.png rename to make_iso/syslinux/splash.png diff --git a/syslinux/splash1.png b/make_iso/syslinux/splash1.png similarity index 100% rename from syslinux/splash1.png rename to make_iso/syslinux/splash1.png diff --git a/syslinux/splash2.png b/make_iso/syslinux/splash2.png similarity index 100% rename from syslinux/splash2.png rename to make_iso/syslinux/splash2.png diff --git a/syslinux/splash3.png b/make_iso/syslinux/splash3.png similarity index 100% rename from syslinux/splash3.png rename to make_iso/syslinux/splash3.png diff --git a/syslinux/syslinux.cfg b/make_iso/syslinux/syslinux.cfg similarity index 100% rename from syslinux/syslinux.cfg rename to make_iso/syslinux/syslinux.cfg diff --git a/07_push.sh b/push.sh similarity index 100% rename from 07_push.sh rename to push.sh