Skip to content

Commit

Permalink
Merge branch 'endeavouros-team:main' into galileo
Browse files Browse the repository at this point in the history
  • Loading branch information
NoaHimesaka1873 authored Dec 24, 2023
2 parents 12c6e16 + 76c6ae9 commit 699fe26
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,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.

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
loginMode=emptySession
5 changes: 5 additions & 0 deletions mkarchiso-changes.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
8 changes: 1 addition & 7 deletions packages.x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ kate
kdeplasma-addons
kdeconnect
kde-gtk-config
kgamma5
kgamma
khotkeys
kimageformats5
kinfocenter
Expand All @@ -235,12 +235,6 @@ sddm-kcm
spectacle
xsettingsd

## Editor
kate

## Archive
file-roller

## Browser
firefox

Expand Down

0 comments on commit 699fe26

Please sign in to comment.