From 8b611cf654fa5f0a45612bf82a55d6ba8fb34913 Mon Sep 17 00:00:00 2001 From: adi1090x Date: Wed, 5 Jul 2023 16:08:42 +0530 Subject: [PATCH] Updated ISO Profile --- changelog.md | 21 +++++++ .../xfce-perchannel-xml/xfce4-session.xml | 8 +++ .../etc/systemd/network/20-ethernet.network | 1 + .../etc/systemd/network/20-wlan.network | 1 + .../etc/systemd/resolved.conf.d/archiso.conf | 4 ++ profile/airootfs/root/.automated_script.sh | 11 +++- profile/airootfs/root/customize_airootfs.sh | 11 ++-- profile/airootfs/usr/local/bin/xflock4 | 2 +- .../entries/01-archcraftiso-x86_64-linux.conf | 10 ++-- ...archcraftiso-x86_64-linux-open-source.conf | 10 ++-- .../03-archcraftiso-x86_64-linux-nvidia.conf | 10 ++-- ...4-archcraftiso-x86_64-linux-nomodeset.conf | 10 ++-- profile/grub/grub.cfg | 22 ++++--- profile/mkarchcraftiso | 60 ++++++++++++++----- profile/packages.x86_64 | 5 ++ profile/pacman.conf | 13 ++-- profile/profiledef.sh | 4 +- profile/syslinux/archcraftiso_pxe-linux.cfg | 18 +++--- profile/syslinux/archcraftiso_sys-linux.cfg | 8 +-- 19 files changed, 149 insertions(+), 80 deletions(-) create mode 100644 profile/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml create mode 100644 profile/airootfs/etc/systemd/resolved.conf.d/archiso.conf diff --git a/changelog.md b/changelog.md index 76dbd56f..c04ddc08 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,26 @@

Archcraft : Changelogs

+### July 2023 +- Updated ISO profile with latest archiso +- Latest base with new packages +- Fixed `xfce-power-manager` issue (not locking the screen on lid close) +- Fixed sddm not saving the last used session issue +- Added a calculator app +- **`Openbox WM`** + - Added `tint2` as alternate panel (in all themes) + - Ability to switch between panels + - Added `bluetooth` module on both panels + - Added a rofi `bluetooth` applet + - Fixed window resizing issue via each side of window + - etc +- **`BSPWM`** + - Added `bluetooth` module on polybar (in all themes) + - Added a rofi `bluetooth` applet + - etc +- Many small bugs fixed. + +# + ### April 2023 **`Update (1st May): `** - Fixed `pacman-init` issue in last ISO. diff --git a/profile/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/profile/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml new file mode 100644 index 00000000..0d0749c1 --- /dev/null +++ b/profile/airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/profile/airootfs/etc/systemd/network/20-ethernet.network b/profile/airootfs/etc/systemd/network/20-ethernet.network index 9ada7782..ce8de1fb 100644 --- a/profile/airootfs/etc/systemd/network/20-ethernet.network +++ b/profile/airootfs/etc/systemd/network/20-ethernet.network @@ -7,6 +7,7 @@ Name=eth* [Network] DHCP=yes +MulticastDNS=yes IPv6PrivacyExtensions=yes # systemd-networkd does not set per-interface-type default route metrics diff --git a/profile/airootfs/etc/systemd/network/20-wlan.network b/profile/airootfs/etc/systemd/network/20-wlan.network index 601d5b8f..e5990bf4 100644 --- a/profile/airootfs/etc/systemd/network/20-wlan.network +++ b/profile/airootfs/etc/systemd/network/20-wlan.network @@ -3,6 +3,7 @@ Name=wl* [Network] DHCP=yes +MulticastDNS=yes IPv6PrivacyExtensions=yes # systemd-networkd does not set per-interface-type default route metrics diff --git a/profile/airootfs/etc/systemd/resolved.conf.d/archiso.conf b/profile/airootfs/etc/systemd/resolved.conf.d/archiso.conf new file mode 100644 index 00000000..636f3bd6 --- /dev/null +++ b/profile/airootfs/etc/systemd/resolved.conf.d/archiso.conf @@ -0,0 +1,4 @@ +# Default systemd-resolved configuration for archiso + +[Resolve] +MulticastDNS=yes diff --git a/profile/airootfs/root/.automated_script.sh b/profile/airootfs/root/.automated_script.sh index 52c47e6a..f2575374 100755 --- a/profile/airootfs/root/.automated_script.sh +++ b/profile/airootfs/root/.automated_script.sh @@ -16,7 +16,13 @@ automated_script () script="$(script_cmdline)" if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then - curl "${script}" --location --retry-connrefused --retry 10 -s -o /tmp/startup_script >/dev/null + # there's no synchronization for network availability before executing this script + printf '%s: waiting for network-online.target\n' "$0" + until systemctl --quiet is-active network-online.target; do + sleep 1 + done + printf '%s: downloading %s\n' "$0" "${script}" + curl "${script}" --location --retry-connrefused --retry 10 -s -o /tmp/startup_script rt=$? else cp "${script}" /tmp/startup_script @@ -24,6 +30,9 @@ automated_script () fi if [[ ${rt} -eq 0 ]]; then chmod +x /tmp/startup_script + printf '%s: executing automated script\n' "$0" + # note that script is executed when other services (like pacman-init) may be still in progress, please + # synchronize to "systemctl is-system-running --wait" when your script depends on other services /tmp/startup_script fi fi diff --git a/profile/airootfs/root/customize_airootfs.sh b/profile/airootfs/root/customize_airootfs.sh index b9ea5916..86c62428 100755 --- a/profile/airootfs/root/customize_airootfs.sh +++ b/profile/airootfs/root/customize_airootfs.sh @@ -28,7 +28,7 @@ _EOF_ ## Enable Parallel Downloads sed -i -e 's|#ParallelDownloads.*|ParallelDownloads = 5|g' /etc/pacman.conf -sed -i -e '/#\[testing\]/Q' /etc/pacman.conf +sed -i -e '/#\[core-testing\]/Q' /etc/pacman.conf ## Append archcraft repository to pacman.conf cat >> "/etc/pacman.conf" <<- EOL @@ -36,19 +36,16 @@ cat >> "/etc/pacman.conf" <<- EOL SigLevel = Optional TrustAll Include = /etc/pacman.d/archcraft-mirrorlist - #[testing] + #[core-testing] #Include = /etc/pacman.d/mirrorlist [core] Include = /etc/pacman.d/mirrorlist - [extra] - Include = /etc/pacman.d/mirrorlist - - #[community-testing] + #[extra-testing] #Include = /etc/pacman.d/mirrorlist - [community] + [extra] Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, diff --git a/profile/airootfs/usr/local/bin/xflock4 b/profile/airootfs/usr/local/bin/xflock4 index 25c6ddad..c368445c 100755 --- a/profile/airootfs/usr/local/bin/xflock4 +++ b/profile/airootfs/usr/local/bin/xflock4 @@ -4,4 +4,4 @@ ## Script to Lock the session by xfce-power-manager -betterlockscreen --lock +betterlockscreen --lock & diff --git a/profile/efiboot/loader/entries/01-archcraftiso-x86_64-linux.conf b/profile/efiboot/loader/entries/01-archcraftiso-x86_64-linux.conf index bdde43bc..2c171d78 100644 --- a/profile/efiboot/loader/entries/01-archcraftiso-x86_64-linux.conf +++ b/profile/efiboot/loader/entries/01-archcraftiso-x86_64-linux.conf @@ -1,7 +1,7 @@ title Boot Archcraft (x86_64, UEFI) sort-key 01 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -initrd /%INSTALL_DIR%/boot/intel-ucode.img -initrd /%INSTALL_DIR%/boot/amd-ucode.img -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n module_blacklist=pcspkr,snd_pcsp +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +initrd /%INSTALL_DIR%/boot/intel-ucode.img +initrd /%INSTALL_DIR%/boot/amd-ucode.img +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n module_blacklist=pcspkr,snd_pcsp diff --git a/profile/efiboot/loader/entries/02-archcraftiso-x86_64-linux-open-source.conf b/profile/efiboot/loader/entries/02-archcraftiso-x86_64-linux-open-source.conf index 9ba6e0bd..5bb60f19 100644 --- a/profile/efiboot/loader/entries/02-archcraftiso-x86_64-linux-open-source.conf +++ b/profile/efiboot/loader/entries/02-archcraftiso-x86_64-linux-open-source.conf @@ -1,7 +1,7 @@ title Boot Archcraft (x86_64, UEFI, open source) sort-key 02 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -initrd /%INSTALL_DIR%/boot/intel-ucode.img -initrd /%INSTALL_DIR%/boot/amd-ucode.img -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm module_blacklist=pcspkr,snd_pcsp +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +initrd /%INSTALL_DIR%/boot/intel-ucode.img +initrd /%INSTALL_DIR%/boot/amd-ucode.img +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm module_blacklist=pcspkr,snd_pcsp diff --git a/profile/efiboot/loader/entries/03-archcraftiso-x86_64-linux-nvidia.conf b/profile/efiboot/loader/entries/03-archcraftiso-x86_64-linux-nvidia.conf index 8c3f67ad..c4df285b 100644 --- a/profile/efiboot/loader/entries/03-archcraftiso-x86_64-linux-nvidia.conf +++ b/profile/efiboot/loader/entries/03-archcraftiso-x86_64-linux-nvidia.conf @@ -1,7 +1,7 @@ title Boot Archcraft (x86_64, UEFI, nvidia) sort-key 03 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -initrd /%INSTALL_DIR%/boot/intel-ucode.img -initrd /%INSTALL_DIR%/boot/amd-ucode.img -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-nvidia.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nvidia_drm.modeset=1 nouveau.modeset=0 module_blacklist=nouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes module_blacklist=pcspkr,snd_pcsp +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +initrd /%INSTALL_DIR%/boot/intel-ucode.img +initrd /%INSTALL_DIR%/boot/amd-ucode.img +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-nvidia.img +options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nvidia_drm.modeset=1 nouveau.modeset=0 module_blacklist=nouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes module_blacklist=pcspkr,snd_pcsp diff --git a/profile/efiboot/loader/entries/04-archcraftiso-x86_64-linux-nomodeset.conf b/profile/efiboot/loader/entries/04-archcraftiso-x86_64-linux-nomodeset.conf index 52984dba..6503d152 100644 --- a/profile/efiboot/loader/entries/04-archcraftiso-x86_64-linux-nomodeset.conf +++ b/profile/efiboot/loader/entries/04-archcraftiso-x86_64-linux-nomodeset.conf @@ -1,7 +1,7 @@ title Boot Archcraft (x86_64, UEFI, nomodeset) sort-key 04 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -initrd /%INSTALL_DIR%/boot/intel-ucode.img -initrd /%INSTALL_DIR%/boot/amd-ucode.img -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nomodeset module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes module_blacklist=pcspkr,snd_pcsp +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +initrd /%INSTALL_DIR%/boot/intel-ucode.img +initrd /%INSTALL_DIR%/boot/amd-ucode.img +initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nomodeset module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes module_blacklist=pcspkr,snd_pcsp diff --git a/profile/grub/grub.cfg b/profile/grub/grub.cfg index 06fcb937..6c871000 100644 --- a/profile/grub/grub.cfg +++ b/profile/grub/grub.cfg @@ -40,43 +40,41 @@ timeout_style=menu # Menu entries menuentry "Boot Archcraft (x86_64, UEFI)" --class archcraft --class arch --class gnu-linux --class gnu --class os --id 'archcraft' { set gfxpayload=keep - search --no-floppy --set=root --label %ARCHISO_LABEL% - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n module_blacklist=pcspkr,snd_pcsp + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n module_blacklist=pcspkr,snd_pcsp initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img } menuentry "Boot Archcraft (x86_64, UEFI, open source)" --class archcraft --class arch --class gnu-linux --class gnu --class os --id 'archcraftos' { set gfxpayload=keep - search --no-floppy --set=root --label %ARCHISO_LABEL% - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm module_blacklist=pcspkr,snd_pcsp + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm module_blacklist=pcspkr,snd_pcsp initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img } menuentry "Boot Archcraft (x86_64, UEFI, nvidia)" --class archcraft --class arch --class gnu-linux --class gnu --class os --id 'archcraftpn' { set gfxpayload=keep - search --no-floppy --set=root --label %ARCHISO_LABEL% - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nvidia_drm.modeset=1 nouveau.modeset=0 module_blacklist=nouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes module_blacklist=pcspkr,snd_pcsp + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nvidia_drm.modeset=1 nouveau.modeset=0 module_blacklist=nouveau radeon.modeset=1 i915.modeset=1 nvme_load=yes module_blacklist=pcspkr,snd_pcsp initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux-nvidia.img } menuentry "Boot Archcraft (x86_64, UEFI, nomodeset)" --class archcraft --class arch --class gnu-linux --class gnu --class os --id 'archcraftnm' { set gfxpayload=keep - search --no-floppy --set=root --label %ARCHISO_LABEL% - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nomodeset module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes module_blacklist=pcspkr,snd_pcsp + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} quiet splash loglevel=3 udev.log_level=3 vt.global_cursor_default=0 cow_spacesize=5G copytoram=n nomodeset module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nouveau.modeset=0 radeon.modeset=0 i915.modeset=0 nvme_load=yes module_blacklist=pcspkr,snd_pcsp initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img } if [ "${grub_platform}" == "efi" ]; then if [ "${grub_cpu}" == "x86_64" ]; then - menuentry "UEFI Shell" --class recovery { + menuentry "Run Memtest86+ (RAM test)" --class memtest86 --class memtest --class gnu --class tool { + set gfxpayload=800x600,1024x768 + linux /boot/memtest86+/memtest.efi + } + menuentry "UEFI Shell" --class recovery --class efi { insmod chain - search --no-floppy --set=root --label %ARCHISO_LABEL% chainloader /shellx64.efi } elif [ "${grub_cpu}" == "i386" ]; then - menuentry "UEFI Shell" --class recovery { + menuentry "UEFI Shell" --class recovery --class efi { insmod chain - search --no-floppy --set=root --label %ARCHISO_LABEL% chainloader /shellia32.efi } fi diff --git a/profile/mkarchcraftiso b/profile/mkarchcraftiso index bfca543b..95236641 100755 --- a/profile/mkarchcraftiso +++ b/profile/mkarchcraftiso @@ -29,6 +29,7 @@ gpg_key="" gpg_sender="" iso_name="" iso_label="" +iso_uuid="" iso_publisher="" iso_application="" iso_version="" @@ -38,6 +39,7 @@ pacman_conf="" packages="" bootstrap_packages="" pacstrap_dir="" +declare -i rm_work_dir=0 buildmodes=() bootmodes=() airootfs_image_type="" @@ -86,7 +88,7 @@ usage: ${app_name} [options] Default: '${iso_application}' -C pacman configuration file. Default: '${pacman_conf}' - -D Set an install_dir. All files will by located here. + -D Set an install_dir. All files will be located here. Default: '${install_dir}' NOTE: Max 8 characters, use only [a-z0-9] -L