Skip to content

Commit

Permalink
[archiso] some changes merged from upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
killajoe committed Sep 19, 2023
1 parent fa6c069 commit 94e9d78
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
1 change: 0 additions & 1 deletion airootfs/etc/environment
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
#
# Syntax: simple "KEY=VAL" pairs on separate lines
#
QT_QPA_PLATFORMTHEME=qt5ct
BROWSER=firefox
EDITOR=nano
1 change: 1 addition & 0 deletions packages.x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ virtualbox-guest-utils
open-vm-tools
xf86-input-vmmouse
xf86-video-vmware
xf86-video-qxl

# eos-arm needed packages for chroot into arm device
qemu-arm-aarch64-static-bin
5 changes: 3 additions & 2 deletions profiledef.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ iso_name="EndeavourOS-kde-unstable"
iso_label="EOS_$(date +%Y%m)"
iso_publisher="EndeavourOS <https://endeavouros.com>"
iso_application="EndeavourOS Live/Rescue CD"
iso_version="$(date +%Y.%m.%d)"
iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)"
install_dir="arch"
buildmodes=('iso')
quiet="n"
work_dir="work"
out_dir="out"
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
arch="x86_64"
pacman_conf="airootfs/etc/pacman.conf"
airootfs_image_type="squashfs"
Expand Down
8 changes: 4 additions & 4 deletions run_before_squashfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,17 @@ rm -R "/root/root-theme"
cat "/usr/lib/endeavouros-release" >> "/etc/motd"
echo "------------------" >> "/etc/motd"
# Install locally builded packages on ISO (place packages under airootfs/root/packages)
pacman -U --noconfirm -- "/root/packages/"*".pkg.tar.zst"
rm -rf "/root/packages/"
# Enable systemd services
# --> now in airootfs/etc/systemd/system/multi-user.target.wants
#systemctl enable NetworkManager.service systemd-timesyncd.service bluetooth.service firewalld.service
#systemctl enable vboxservice.service vmtoolsd.service vmware-vmblock-fuse.service
#systemctl enable intel.service
systemctl set-default multi-user.target
# Install locally builded packages on ISO (place packages under airootfs/root/packages)
pacman -U --noconfirm -- "/root/packages/"*".pkg.tar.zst"
rm -rf "/root/packages/"
# Set wallpaper for live-session and original for installed system
mv "endeavouros-wallpaper.png" "/etc/calamares/files/endeavouros-wallpaper.png"
mv "/root/livewall.png" "/usr/share/endeavouros/backgrounds/endeavouros-wallpaper.png"
Expand Down

0 comments on commit 94e9d78

Please sign in to comment.