From 9d9653529f142c0d9062220fc235bc6d49782905 Mon Sep 17 00:00:00 2001 From: Matt C Date: Sun, 28 Aug 2022 23:14:08 -0400 Subject: [PATCH 01/15] remove gitlab-ci and minor cleanup of build script --- .gitlab-ci.yml | 10 ---------- build.sh | 10 +++++----- 2 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 4395670..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,10 +0,0 @@ -image: "archlinux" - -iso: - before_script: - - pacman -Sy reflector --noconfirm --needed - - reflector --latest 5 --sort rate --save /etc/pacman.d/mirrorlist - - pacman -Sy sudo base-devel pacman-contrib archiso wget git --noconfirm --needed - script: - - ./build_iso.sh - - cp *.iso /output/. -v \ No newline at end of file diff --git a/build.sh b/build.sh index e747e69..6148623 100755 --- a/build.sh +++ b/build.sh @@ -4,7 +4,7 @@ if [[ "$2" == "" ]]; then else WORKDIR="$2" if [[ ! -d "$WORKDIR" ]]; then - mkdir -p "$WORKDIR" + mkdir -p "$WORKDIR" fi fi if [[ "$1" == "--build-iso" ]]; then @@ -18,11 +18,11 @@ elif [[ "$1" == "--build-bootstrap" ]]; then else RESULTCODE=0 if [[ "$1" == "" ]]; then - echo "no option given, available options are:" - RESULTCODE=1 + echo "no option given, available options are:" + RESULTCODE=1 elif [[ "$1" != "--help" ]]; then - echo "option '$1' not known, available options are:" - RESULTCODE=1 + echo "option '$1' not known, available options are:" + RESULTCODE=1 fi echo "--build-iso builds a crystal linux iso" echo "--build-bootstrap builds a crystal linux rootfs tarball" From 2a7c9cf226f2ed1110903e979f20d3aec44e4743 Mon Sep 17 00:00:00 2001 From: Lexi <63929325+ShyyLexi@users.noreply.github.com> Date: Wed, 31 Aug 2022 15:36:26 +0200 Subject: [PATCH 02/15] Disable auto screen lock --- chrooted-iso.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/chrooted-iso.sh b/chrooted-iso.sh index e3aec08..78a993a 100755 --- a/chrooted-iso.sh +++ b/chrooted-iso.sh @@ -25,6 +25,15 @@ chown -R crystal:crystal /home/crystal/ systemctl enable NetworkManager systemctl enable gdm +# Disable auto screen lock +mkdir -p /etc/skel/.config/autostart +echo "[Desktop Entry] +Name=Deactive lock screen +Comment=Deactive the gnome lock screen in the live session +Type=Application +Icon=nautilus +Exec=sh -c \"gsettings set org.gnome.desktop.screensaver lock-enabled false\"" > /etc/skel/.config/autostart/no-lock-screen.desktop + # Mirrorlist reflector > /etc/pacman.d/mirrorlist From 88ace27df83441061fbffb02b468505d2c31d8a3 Mon Sep 17 00:00:00 2001 From: Michal Date: Sat, 3 Sep 2022 12:59:08 +0100 Subject: [PATCH 03/15] Update chrooted-iso.sh Signed-off-by: Michal --- chrooted-iso.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/chrooted-iso.sh b/chrooted-iso.sh index 78a993a..c8f144c 100755 --- a/chrooted-iso.sh +++ b/chrooted-iso.sh @@ -19,6 +19,7 @@ mkdir -p /home/crystal/Desktop cp \ /var/lib/flatpak/exports/share/applications/al.getcryst.jadegui.desktop \ /home/crystal/Desktop/Install.desktop + chown -R crystal:crystal /home/crystal/ # Services @@ -26,13 +27,16 @@ systemctl enable NetworkManager systemctl enable gdm # Disable auto screen lock -mkdir -p /etc/skel/.config/autostart +mkdir -p /home/crystal/.config/autostart echo "[Desktop Entry] Name=Deactive lock screen Comment=Deactive the gnome lock screen in the live session Type=Application Icon=nautilus Exec=sh -c \"gsettings set org.gnome.desktop.screensaver lock-enabled false\"" > /etc/skel/.config/autostart/no-lock-screen.desktop +cp \ + /var/lib/flatpak/exports/share/applications/al.getcryst.jadegui.desktop \ + /home/crystal/.config/autostart # Mirrorlist reflector > /etc/pacman.d/mirrorlist From 4b7856abdd8f6dfbe41403b95571a71883cae6d8 Mon Sep 17 00:00:00 2001 From: Michal Date: Sat, 3 Sep 2022 12:59:25 +0100 Subject: [PATCH 04/15] Update chrooted-iso.sh Signed-off-by: Michal --- chrooted-iso.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrooted-iso.sh b/chrooted-iso.sh index c8f144c..dc63306 100755 --- a/chrooted-iso.sh +++ b/chrooted-iso.sh @@ -33,7 +33,7 @@ Name=Deactive lock screen Comment=Deactive the gnome lock screen in the live session Type=Application Icon=nautilus -Exec=sh -c \"gsettings set org.gnome.desktop.screensaver lock-enabled false\"" > /etc/skel/.config/autostart/no-lock-screen.desktop +Exec=sh -c \"gsettings set org.gnome.desktop.screensaver lock-enabled false\"" > /home/crystal/.config/autostart/no-lock-screen.desktop cp \ /var/lib/flatpak/exports/share/applications/al.getcryst.jadegui.desktop \ /home/crystal/.config/autostart From 26c7458c79a72e98fe4a67c1cdaa075d4433799e Mon Sep 17 00:00:00 2001 From: Michal S Date: Sat, 3 Sep 2022 14:29:36 +0100 Subject: [PATCH 05/15] Chrooted ISO changes --- chrooted-iso.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/chrooted-iso.sh b/chrooted-iso.sh index dc63306..eae5cce 100755 --- a/chrooted-iso.sh +++ b/chrooted-iso.sh @@ -1,9 +1,6 @@ #!/usr/bin/env bash echo "Chrooted in the new system, running as $(whoami)" -# Compile GSchemas -glib-compile-schemas /usr/share/glib-2.0/schemas - # User setup useradd -mG wheel crystal usermod -c "Password // \"crystal\"" crystal @@ -11,7 +8,7 @@ usermod -p $(echo "crystal" | openssl passwd -6 -stdin) crystal usermod -p $(echo "crystal" | openssl passwd -6 -stdin) root chsh -s /usr/bin/zsh crystal -# Install Jade's GUI +# Install Jade GUI flatpak install -y --noninteractive /usr/share/jade-gui/jade-gui.flatpak # Desktop icon for Jade's GUI @@ -20,12 +17,6 @@ cp \ /var/lib/flatpak/exports/share/applications/al.getcryst.jadegui.desktop \ /home/crystal/Desktop/Install.desktop -chown -R crystal:crystal /home/crystal/ - -# Services -systemctl enable NetworkManager -systemctl enable gdm - # Disable auto screen lock mkdir -p /home/crystal/.config/autostart echo "[Desktop Entry] @@ -34,10 +25,20 @@ Comment=Deactive the gnome lock screen in the live session Type=Application Icon=nautilus Exec=sh -c \"gsettings set org.gnome.desktop.screensaver lock-enabled false\"" > /home/crystal/.config/autostart/no-lock-screen.desktop + +# Jade-GUI Autostart cp \ /var/lib/flatpak/exports/share/applications/al.getcryst.jadegui.desktop \ /home/crystal/.config/autostart +# Permissions for Crystal user +chown -R crystal:crystal /home/crystal/ +chmod +x /home/crystal/.config/autostart/*.desktop + +# Services +systemctl enable NetworkManager +systemctl enable gdm + # Mirrorlist reflector > /etc/pacman.d/mirrorlist From 596f5d7c0844c582c6b6bdffc953b57d918b7aa6 Mon Sep 17 00:00:00 2001 From: axtloss Date: Sun, 4 Sep 2022 02:22:01 +0200 Subject: [PATCH 06/15] Update pacman.conf Signed-off-by: axtloss --- crystal/pacman.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/crystal/pacman.conf b/crystal/pacman.conf index 49c07f6..f642589 100644 --- a/crystal/pacman.conf +++ b/crystal/pacman.conf @@ -78,9 +78,6 @@ Server = https://repo.getcryst.al/x86_64/ [crystal-any] Server = https://repo.getcryst.al/any/ -[crystal-extra] -Server = https://repo.getcryst.al/extra/ - #[testing] #Include = /etc/pacman.d/mirrorlist From f47430e1807875d87eea7088aaf8aefc7b989eef Mon Sep 17 00:00:00 2001 From: axtloss Date: Sat, 10 Sep 2022 13:50:20 +0200 Subject: [PATCH 07/15] Add onyx and set as default session --- chrooted-iso.sh | 4 ++++ crystal/packages.x86_64 | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/chrooted-iso.sh b/chrooted-iso.sh index eae5cce..5647ad4 100755 --- a/chrooted-iso.sh +++ b/chrooted-iso.sh @@ -50,4 +50,8 @@ echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen echo "LANG=en_US.UTF-8" > /etc/locale.conf locale-gen +# Onyx as default gdm session +rm /usr/share/xsessions/gnome* +rm /usr/share/wayland-sessions/gnome* + echo "Configured the system. Exiting chroot." diff --git a/crystal/packages.x86_64 b/crystal/packages.x86_64 index cb1ef68..e58b457 100644 --- a/crystal/packages.x86_64 +++ b/crystal/packages.x86_64 @@ -25,7 +25,7 @@ zsh # GUI Target firefox gdm -gnome +onyx gparted mesa spice-vdagent From a09409937e5347885d3385fee3978b3f4c531270 Mon Sep 17 00:00:00 2001 From: axtloss Date: Mon, 12 Sep 2022 20:29:59 +0200 Subject: [PATCH 08/15] add f2fs-tools this adds f2fs support in the iso Signed-off-by: axtloss --- crystal/packages.x86_64 | 1 + 1 file changed, 1 insertion(+) diff --git a/crystal/packages.x86_64 b/crystal/packages.x86_64 index e58b457..9bf4daa 100644 --- a/crystal/packages.x86_64 +++ b/crystal/packages.x86_64 @@ -6,6 +6,7 @@ curl curl dosfstools edk2-shell +f2fs-tools linux linux-firmware memtest86+ From f7c88f5326008786c7bea3c18286ec52d2e19434 Mon Sep 17 00:00:00 2001 From: axtloss Date: Mon, 12 Sep 2022 20:29:59 +0200 Subject: [PATCH 09/15] add f2fs-tools this adds f2fs support in the iso Signed-off-by: axtloss --- crystal/packages.x86_64 | 1 + 1 file changed, 1 insertion(+) diff --git a/crystal/packages.x86_64 b/crystal/packages.x86_64 index e58b457..9bf4daa 100644 --- a/crystal/packages.x86_64 +++ b/crystal/packages.x86_64 @@ -6,6 +6,7 @@ curl curl dosfstools edk2-shell +f2fs-tools linux linux-firmware memtest86+ From 19962cbd3012db829a93bcb7eba61c1c073f2bda Mon Sep 17 00:00:00 2001 From: Michal S Date: Tue, 13 Sep 2022 17:15:10 +0100 Subject: [PATCH 10/15] Properly implement ISO default session --- chrooted-iso.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/chrooted-iso.sh b/chrooted-iso.sh index 5647ad4..155e50f 100755 --- a/chrooted-iso.sh +++ b/chrooted-iso.sh @@ -26,6 +26,12 @@ Type=Application Icon=nautilus Exec=sh -c \"gsettings set org.gnome.desktop.screensaver lock-enabled false\"" > /home/crystal/.config/autostart/no-lock-screen.desktop +# Set default session to Onyx +echo "[User] +Session=onyx +Icon=/var/lib/AccountsService/icons/crystal +SystemAccount=false" > /var/lib/AccountsService/users/crystal + # Jade-GUI Autostart cp \ /var/lib/flatpak/exports/share/applications/al.getcryst.jadegui.desktop \ @@ -50,8 +56,4 @@ echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen echo "LANG=en_US.UTF-8" > /etc/locale.conf locale-gen -# Onyx as default gdm session -rm /usr/share/xsessions/gnome* -rm /usr/share/wayland-sessions/gnome* - echo "Configured the system. Exiting chroot." From 338da285ab7c799d5bc0f19451bb9fba524d6105 Mon Sep 17 00:00:00 2001 From: axtloss Date: Thu, 15 Sep 2022 18:15:17 +0200 Subject: [PATCH 11/15] Add open-vm-tools and virtualbox-guest-utils this gives a better experience when using crystal with vmware or virtualbox --- chrooted-iso.sh | 12 ++++++------ crystal/packages.x86_64 | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/chrooted-iso.sh b/chrooted-iso.sh index 155e50f..59eecb4 100755 --- a/chrooted-iso.sh +++ b/chrooted-iso.sh @@ -26,12 +26,6 @@ Type=Application Icon=nautilus Exec=sh -c \"gsettings set org.gnome.desktop.screensaver lock-enabled false\"" > /home/crystal/.config/autostart/no-lock-screen.desktop -# Set default session to Onyx -echo "[User] -Session=onyx -Icon=/var/lib/AccountsService/icons/crystal -SystemAccount=false" > /var/lib/AccountsService/users/crystal - # Jade-GUI Autostart cp \ /var/lib/flatpak/exports/share/applications/al.getcryst.jadegui.desktop \ @@ -42,6 +36,8 @@ chown -R crystal:crystal /home/crystal/ chmod +x /home/crystal/.config/autostart/*.desktop # Services +systemctl enable vmtoolsd +systemctl enable vmware-vmblock-fuse systemctl enable NetworkManager systemctl enable gdm @@ -56,4 +52,8 @@ echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen echo "LANG=en_US.UTF-8" > /etc/locale.conf locale-gen +# Onyx as default gdm session +rm /usr/share/xsessions/gnome* +rm /usr/share/wayland-sessions/gnome* + echo "Configured the system. Exiting chroot." diff --git a/crystal/packages.x86_64 b/crystal/packages.x86_64 index 9bf4daa..904b5fc 100644 --- a/crystal/packages.x86_64 +++ b/crystal/packages.x86_64 @@ -6,7 +6,7 @@ curl curl dosfstools edk2-shell -f2fs-tools +gtkmm3 linux linux-firmware memtest86+ @@ -20,6 +20,8 @@ reflector syslinux systemd-sysvcompat tree +virtualbox-guest-utils +open-vm-tools xfsprogs zsh From 96c5adb15871b6ccc9f4130f2a7ba3c4f79f2697 Mon Sep 17 00:00:00 2001 From: axtloss Date: Thu, 15 Sep 2022 20:28:35 +0200 Subject: [PATCH 12/15] Update chrooted-iso.sh Signed-off-by: axtloss --- chrooted-iso.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/chrooted-iso.sh b/chrooted-iso.sh index 59eecb4..88f8344 100755 --- a/chrooted-iso.sh +++ b/chrooted-iso.sh @@ -26,6 +26,12 @@ Type=Application Icon=nautilus Exec=sh -c \"gsettings set org.gnome.desktop.screensaver lock-enabled false\"" > /home/crystal/.config/autostart/no-lock-screen.desktop +# Set default session to Onyx +echo "[User] +Session=onyx +Icon=/var/lib/AccountsService/icons/crystal +SystemAccount=false" > /var/lib/AccountsService/users/crystal + # Jade-GUI Autostart cp \ /var/lib/flatpak/exports/share/applications/al.getcryst.jadegui.desktop \ @@ -52,8 +58,4 @@ echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen echo "LANG=en_US.UTF-8" > /etc/locale.conf locale-gen -# Onyx as default gdm session -rm /usr/share/xsessions/gnome* -rm /usr/share/wayland-sessions/gnome* - echo "Configured the system. Exiting chroot." From 153afb28660a332b4d1c06bad911d24cb50c89eb Mon Sep 17 00:00:00 2001 From: Matt C Date: Thu, 29 Sep 2022 02:08:32 +0000 Subject: [PATCH 13/15] Closes [FEATURE]: Request ISO-8601 date format be standardized on #21 --- .github/workflows/build.yml | 3 ++- crystal/pacman.conf | 4 ++-- crystal/profiledef.sh | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 67454d4..188a68a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,8 @@ jobs: id: build run: | # Set BUILD_DATE - export BUILD_DATE=$(date +'%m-%d-%g-%H-%M') + # 2022-09-29 + export BUILD_DATE=$(date +'%Y-%m-%d') # Make sure container is up-to-date pacman -Syu --needed --noconfirm diff --git a/crystal/pacman.conf b/crystal/pacman.conf index f642589..e42ecc0 100644 --- a/crystal/pacman.conf +++ b/crystal/pacman.conf @@ -73,10 +73,10 @@ RemoteFileSigLevel = Never # after the header, and they will be used before the default mirrors. [crystal-x86_64] -Server = https://repo.getcryst.al/x86_64/ +Include = /etc/pacman.d/crystal-mirrorlist [crystal-any] -Server = https://repo.getcryst.al/any/ +Include = /etc/pacman.d/crystal-mirrorlist #[testing] #Include = /etc/pacman.d/mirrorlist diff --git a/crystal/profiledef.sh b/crystal/profiledef.sh index f4e4598..77c15ec 100644 --- a/crystal/profiledef.sh +++ b/crystal/profiledef.sh @@ -2,10 +2,10 @@ # shellcheck disable=SC2034 iso_name="crystal-live" -iso_label="CRYS_$(date +%Y%m)" +iso_label="CRYS_$(date +'%Y-%m-%d')" iso_publisher="Crystal Linux " iso_application="Crystal Linux Live" -iso_version="$(date +"%m-%d-%g-%H-%M")" +iso_version="$(date +'%Y-%m-%d')" install_dir="arch" bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito') arch="x86_64" From decd9cb3a08023dd1fc21233d65866c8d75e91c7 Mon Sep 17 00:00:00 2001 From: Michal S Date: Wed, 28 Sep 2022 10:56:11 +0100 Subject: [PATCH 14/15] Adds extra packages and enables reflector.service --- chrooted-iso.sh | 1 + crystal/packages.x86_64 | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/chrooted-iso.sh b/chrooted-iso.sh index 88f8344..56fda90 100755 --- a/chrooted-iso.sh +++ b/chrooted-iso.sh @@ -45,6 +45,7 @@ chmod +x /home/crystal/.config/autostart/*.desktop systemctl enable vmtoolsd systemctl enable vmware-vmblock-fuse systemctl enable NetworkManager +systemctl enable reflector systemctl enable gdm # Mirrorlist diff --git a/crystal/packages.x86_64 b/crystal/packages.x86_64 index 904b5fc..201f917 100644 --- a/crystal/packages.x86_64 +++ b/crystal/packages.x86_64 @@ -1,5 +1,6 @@ # Arch packages arch-install-scripts +archlinux-keyring btrfs-progs cowsay curl @@ -25,6 +26,15 @@ open-vm-tools xfsprogs zsh +# Fonts +noto-fonts +noto-fonts-emoji +noto-fonts-extra +noto-fonts-cjk + +# Networking +openvpn + # GUI Target firefox gdm @@ -33,6 +43,8 @@ gparted mesa spice-vdagent xorg +pipewire +pipewire-pulse # Things we're hosting base @@ -40,16 +52,16 @@ filesystem grub lsb-release neofetch -pfetch sudo # Our packages -amethyst +ame crystal-wallpapers +crystal-mirrorlist +crystal-keyring jade jade-gui # Text editors -micro nano vim From 5efce77f8cf17470cc95c008bf7fe0c3abed2ea9 Mon Sep 17 00:00:00 2001 From: Michal S Date: Wed, 28 Sep 2022 11:46:10 +0100 Subject: [PATCH 15/15] Fixes pacman-init.service --- crystal/airootfs/etc/systemd/system/pacman-init.service | 3 --- 1 file changed, 3 deletions(-) diff --git a/crystal/airootfs/etc/systemd/system/pacman-init.service b/crystal/airootfs/etc/systemd/system/pacman-init.service index afbb35e..33d69ce 100644 --- a/crystal/airootfs/etc/systemd/system/pacman-init.service +++ b/crystal/airootfs/etc/systemd/system/pacman-init.service @@ -9,11 +9,8 @@ After=etc-pacman.d-gnupg.mount [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/bin/bash -c "echo hi" ExecStart=/usr/bin/pacman-key --init ExecStart=/usr/bin/pacman-key --populate archlinux -ExecStart=/usr/bin/reflector --latest 5 --sort rate --save /etc/pacman.d/mirrorlist -ExecStart=/usr/bin/sed -i 's/#Server/Server/g' /etc/pacman.d/mirrorlist [Install]