From dcff42d7583b7abdfe7f9a2abecbaf8e7cfc88aa Mon Sep 17 00:00:00 2001 From: Matt C Date: Sun, 28 Aug 2022 23:14:08 -0400 Subject: [PATCH 1/8] 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 ff923d35dca69346740a03fa0f341eca37f779c8 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 2/8] 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 ff2daf7ab014f3f39a5bbe290019fdf8b146cbf6 Mon Sep 17 00:00:00 2001 From: Michal Date: Sat, 3 Sep 2022 12:59:08 +0100 Subject: [PATCH 3/8] 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 b7f00cd4fcf96e849f7f28a47da0dd9db392b3d7 Mon Sep 17 00:00:00 2001 From: Michal Date: Sat, 3 Sep 2022 12:59:25 +0100 Subject: [PATCH 4/8] 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 4b9b8b0125e088497f92095a995e6f9df7630493 Mon Sep 17 00:00:00 2001 From: Michal S Date: Sat, 3 Sep 2022 14:29:36 +0100 Subject: [PATCH 5/8] 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 ebf38ddb966497bc86ba4e01c92e9614707b97d4 Mon Sep 17 00:00:00 2001 From: axtloss Date: Sun, 4 Sep 2022 02:22:01 +0200 Subject: [PATCH 6/8] 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 8fcef1e191913023985ba4aa1616658ea05035f4 Mon Sep 17 00:00:00 2001 From: axtloss Date: Sat, 10 Sep 2022 13:50:20 +0200 Subject: [PATCH 7/8] 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 8/8] 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+