From 059bedf814ef55e30075a4635c9267be654cfe8e Mon Sep 17 00:00:00 2001 From: Johannes Kamprad Date: Wed, 29 Nov 2023 01:19:25 +0100 Subject: [PATCH 1/7] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68b952a1..aaa42532 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,6 @@ Remove legacy code from `run_before_squashfs.sh` New merged repository structure (october 2021) by joekamprad. Now live-user-desktop-settings are included under /airootfs/root/liveuser-desktop-settings -First step on clean up the natrurally grown ISO structure.. +First step on clean up the naturally grown ISO structure.. Adding [mkarchiso-changes.md](https://github.com/endeavouros-team/EndeavourOS-ISO/blob/main/mkarchiso-changes.md) to keep track of changes on the mkarchiso script for updating it to the latest version from time to time. From af5021713ea0c3d36c1b8c0ecd00a61806f14a44 Mon Sep 17 00:00:00 2001 From: Johannes Kamprad Date: Wed, 29 Nov 2023 01:24:47 +0100 Subject: [PATCH 2/7] Update mkarchiso-changes.md --- mkarchiso-changes.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mkarchiso-changes.md b/mkarchiso-changes.md index 10d3f329..bc1c3722 100644 --- a/mkarchiso-changes.md +++ b/mkarchiso-changes.md @@ -1,3 +1,8 @@ +re-merge upstream changes from 2023-08-29 +``` +Version: archiso 72-1 +``` + removed os-release handling in mkarchiso (16.10.2022): https://github.com/endeavouros-team/EndeavourOS-ISO/commit/67a5a371967b57edf21b6e8a93a2720a358571ec From 24a7f1d092ec0783390db5a8f86300d23385dcc2 Mon Sep 17 00:00:00 2001 From: Johannes Kamprad Date: Wed, 29 Nov 2023 01:30:41 +0100 Subject: [PATCH 3/7] [README.md] mkinitcpio-archiso not needed --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3063aeda..d5c6c0f4 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ https://github.com/endeavouros-team/EndeavourOS-ISO/blob/main/CHANGELOG.md ### Install build dependencies ``` -sudo pacman -S archiso mkinitcpio-archiso git squashfs-tools --needed +sudo pacman -S archiso git squashfs-tools --needed ``` It is recommended to reboot after these changes. From 95038e74520e29967d114ffde7360ec115a03a5f Mon Sep 17 00:00:00 2001 From: Johannes Kamprad Date: Fri, 8 Dec 2023 12:50:53 +0100 Subject: [PATCH 4/7] disable saving session --- .../src/etc/skel/.config/ksmserverrc | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 airootfs/root/endeavouros-skel-liveuser/src/etc/skel/.config/ksmserverrc diff --git a/airootfs/root/endeavouros-skel-liveuser/src/etc/skel/.config/ksmserverrc b/airootfs/root/endeavouros-skel-liveuser/src/etc/skel/.config/ksmserverrc new file mode 100644 index 00000000..1f660530 --- /dev/null +++ b/airootfs/root/endeavouros-skel-liveuser/src/etc/skel/.config/ksmserverrc @@ -0,0 +1,12 @@ +[$Version] +update_info=ksmserver_update_loginMode_value.upd:ksmserver_update_loginMode_value_default_enum + +[General] +confirmLogout=false +loginMode=emptySession + +[LegacySession: saved at previous logout] +count=0 + +[Session: saved at previous logout] +count=0 From 1c3209dfed808ad7ca8bea8d6b29b64f52152d9d Mon Sep 17 00:00:00 2001 From: Johannes Kamprad Date: Fri, 8 Dec 2023 12:52:04 +0100 Subject: [PATCH 5/7] Update ksmserverrc --- .../src/etc/skel/.config/ksmserverrc | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/airootfs/root/endeavouros-skel-liveuser/src/etc/skel/.config/ksmserverrc b/airootfs/root/endeavouros-skel-liveuser/src/etc/skel/.config/ksmserverrc index 1f660530..0a7a912f 100644 --- a/airootfs/root/endeavouros-skel-liveuser/src/etc/skel/.config/ksmserverrc +++ b/airootfs/root/endeavouros-skel-liveuser/src/etc/skel/.config/ksmserverrc @@ -1,12 +1 @@ -[$Version] -update_info=ksmserver_update_loginMode_value.upd:ksmserver_update_loginMode_value_default_enum - -[General] -confirmLogout=false loginMode=emptySession - -[LegacySession: saved at previous logout] -count=0 - -[Session: saved at previous logout] -count=0 From 439287bfc79f59d1384a6b11f0b76968fc43a952 Mon Sep 17 00:00:00 2001 From: Johannes Kamprad Date: Fri, 8 Dec 2023 12:53:34 +0100 Subject: [PATCH 6/7] [packages.x86_64] kgamma5 > kgamma --- packages.x86_64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.x86_64 b/packages.x86_64 index 259975a3..6ff2592a 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -212,7 +212,7 @@ kate kdeplasma-addons kdeconnect kde-gtk-config -kgamma5 +kgamma khotkeys kimageformats5 kinfocenter From 76c6ae9d6207709f7bde9b275195d9ddf120478b Mon Sep 17 00:00:00 2001 From: Johannes Kamprad Date: Fri, 8 Dec 2023 14:07:19 +0100 Subject: [PATCH 7/7] [packages.x86_64] removed leftover apps file-roller --- packages.x86_64 | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages.x86_64 b/packages.x86_64 index 6ff2592a..21524d47 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -232,12 +232,6 @@ sddm-kcm spectacle xsettingsd -## Editor -kate - -## Archive -file-roller - ## Browser firefox