Skip to content

Commit 7354c05

Browse files
committed
The great merge process
0 parents  commit 7354c05

File tree

88 files changed

+5187
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+5187
-0
lines changed

.github/FUNDING.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
open_collective: endeavouros

LICENSE

+674
Large diffs are not rendered by default.

README.md

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
## EndeavourOS-iso-next
2+
3+
## testing new merged repository structure (october 2021) by [email protected]
4+
now live-user-desktop-settings are included under /airootfs/root/liveuser-desktop-settings
5+
6+
7+
[![Maintenance](https://img.shields.io/maintenance/yes/2021.svg)]()
8+
9+
Developer: [joekamprad](https://github.com/killajoe), [manuel](https://github.com/manuel-192) and our beloved community.
10+
11+
Initial Developer: [fernandomaroto](https://github.com/Portergos)
12+
13+
More info: [EndeavourOS-GitHub-Development](https://endeavouros-team.github.io/EndeavourOS-Development/)
14+
15+
## This ISO is based on Arch-ISO modified hugely to provide Installation Environment for EndeavourOS.
16+
17+
https://endeavouros.com
18+
19+
<img src="https://raw.githubusercontent.com/endeavouros-team/artwork-images-logo/master/NEXT/livesession.png" alt="drawing" width="600"/>
20+
21+
EndeavourOS-archiso Sources:
22+
23+
https://github.com/endeavouros-team/EndeavourOS-iso-next
24+
25+
Arch-ISO Source:
26+
27+
https://gitlab.archlinux.org/archlinux/archiso
28+
29+
Live environment on XFCE4-Desktop with calamares as your installer:
30+
31+
https://github.com/calamares/calamares
32+
33+
Bugs can be reported here:
34+
35+
https://forum.endeavouros.com/c/Arch-based-related-questions/bug-reports
36+
37+
Getting help at the forum: https://forum.endeavouros.com
38+
39+
Help-Chat is available on telegram: https://t.me/Endeavouros
40+
41+
News at reddit: https://www.reddit.com/r/EndeavourOS
42+
43+
News at twitter: https://twitter.com/OsEndeavour
44+
45+
Our journey wouldn't be made possible without the generosity of our open collective community:
46+
47+
https://opencollective.com/endeavouros
48+
49+
Systemd-boot for UEFI systems:
50+
51+
<img src="https://raw.githubusercontent.com/endeavouros-team/artwork-images-logo/master/NEXT/systemd-boot.png" alt="drawing" width="600"/>
52+
53+
Bios-boot for legacy systems:
54+
55+
<img src="https://raw.githubusercontent.com/endeavouros-team/artwork-images-logo/master/NEXT/bios-boot.png" alt="drawing" width="600"/>
56+
57+
## How to build ISO:
58+
To build you need to use installed EndeavourOS system or any archbased system with EndeavourOS repository enabled.
59+
60+
https://github.com/endeavouros-team/mirrors
61+
62+
## Install necessary packages
63+
`sudo pacman -S archiso mkinitcpio-archiso git squashfs-tools --needed`
64+
65+
Clone:
66+
`git clone https://github.com/endeavouros-team/EndeavourOS-iso-next.git`
67+
68+
for testing you can use a branch: `git clone -b 08-2021 --single-branch https://github.com/endeavouros-team/EndeavourOS-iso-next.git`
69+
70+
`cd EndeavourOS-iso-next`
71+
72+
## Run fix permissions script
73+
`sudo ./fix_permissions.sh`
74+
75+
## Build
76+
`sudo ./mkarchiso /path/to/profile`
77+
78+
path is where you clone the ISO structure...
79+
80+
## The iso appears at `out` folder
81+
82+
to install locally builded packages on ISO:
83+
you can do so like that putting the packages inside ISO-next/airootfs/root/ and use this lines:
84+
85+
`pacman -U --noconfirm /root/calamares_current-3.2.41.1-5-any.pkg.tar.zst`
86+
87+
`rm /root/calamares_current-3.2.41.1-5-any.pkg.tar.zst`
88+
89+
`pacman -U --noconfirm /root/calamares_config_next-2.0-4-any.pkg.tar.zst`
90+
91+
`rm /root/calamares_config_next-2.0-4-any.pkg.tar.zst`

airootfs/etc/default/useradd

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# useradd defaults file for ArchLinux
2+
# original changes by TomK
3+
GROUP=users
4+
HOME=/home
5+
INACTIVE=-1
6+
EXPIRE=
7+
SHELL=/bin/bash
8+
SKEL=/usr/share/endeavouros/skel
9+
CREATE_MAIL_SPOOL=no

airootfs/etc/environment

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#
2+
# This file is parsed by pam_env module
3+
#
4+
# Syntax: simple "KEY=VAL" pairs on separate lines
5+
#
6+
QT_QPA_PLATFORMTHEME=qt5ct
7+
#QT_STYLE_OVERRIDE=kvantum
8+
BROWSER=firefox
9+
EDITOR=nano

airootfs/etc/group

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
root:x:0:root
2+
adm:x:4:liveuser
3+
wheel:x:10:liveuser
4+
uucp:x:14:liveuser
5+
nopasswdlogin:x:966:liveuser
6+
rfkill:x:983:liveuser
7+
sys:x:3:bin,liveuser
8+
liveuser:x:1000:liveuser

airootfs/etc/gshadow

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
root:!*::root
2+
liveuser:!*::

airootfs/etc/hostname

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#
2+
# SPDX-License-Identifier: GPL-3.0-or-later
3+
EndeavourOS
+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[Greeter]
2+
background=/usr/share/endeavouros/backgrounds/endeavouros-wallpaper.png
3+
stretch-background-across-monitors=false
4+
theme-name=Arc-Darker
5+
draw-user-backgrounds=false

airootfs/etc/locale.conf

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#
2+
# SPDX-License-Identifier: GPL-3.0-or-later
3+
4+
LANG=en_US.UTF-8

airootfs/etc/localtime

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/usr/share/zoneinfo/UTC

airootfs/etc/machine-id

Whitespace-only changes.

airootfs/etc/mkinitcpio.conf

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# vim:set ft=sh
2+
# MODULES
3+
# The following modules are loaded before any boot hooks are
4+
# run. Advanced users may wish to specify all system modules
5+
# in this array. For instance:
6+
# MODULES=(piix ide_disk reiserfs)
7+
MODULES=()
8+
9+
# BINARIES
10+
# This setting includes any additional binaries a given user may
11+
# wish into the CPIO image. This is run last, so it may be used to
12+
# override the actual binaries included by a given hook
13+
# BINARIES are dependency parsed, so you may safely ignore libraries
14+
BINARIES=()
15+
16+
# FILES
17+
# This setting is similar to BINARIES above, however, files are added
18+
# as-is and are not parsed in any way. This is useful for config files.
19+
FILES=()
20+
21+
# HOOKS
22+
# This is the most important setting in this file. The HOOKS control the
23+
# modules and scripts added to the image, and what happens at boot time.
24+
# Order is important, and it is recommended that you do not change the
25+
# order in which HOOKS are added. Run 'mkinitcpio -H <hook name>' for
26+
# help on a given hook.
27+
# 'base' is _required_ unless you know precisely what you are doing.
28+
# 'udev' is _required_ in order to automatically load modules
29+
# 'filesystems' is _required_ unless you specify your fs modules in MODULES
30+
# Examples:
31+
## This setup specifies all modules in the MODULES setting above.
32+
## No raid, lvm2, or encrypted root is needed.
33+
# HOOKS=(base)
34+
#
35+
## This setup will autodetect all modules for your system and should
36+
## work as a sane default
37+
# HOOKS=(base udev autodetect block filesystems)
38+
#
39+
## This setup will generate a 'full' image which supports most systems.
40+
## No autodetection is done.
41+
# HOOKS=(base udev block filesystems)
42+
#
43+
## This setup assembles a pata mdadm array with an encrypted root FS.
44+
## Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
45+
# HOOKS=(base udev block mdadm encrypt filesystems)
46+
#
47+
## This setup loads an lvm2 volume group on a usb device.
48+
# HOOKS=(base udev block lvm2 filesystems)
49+
#
50+
## NOTE: If you have /usr on a separate partition, you MUST include the
51+
# usr, fsck and shutdown hooks.
52+
HOOKS=(base udev modconf memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard)
53+
54+
# COMPRESSION
55+
# Use this to compress the initramfs image. By default, gzip compression
56+
# is used. Use 'cat' to create an uncompressed image.
57+
#COMPRESSION="gzip"
58+
#COMPRESSION="bzip2"
59+
#COMPRESSION="lzma"
60+
#COMPRESSION="xz"
61+
#COMPRESSION="lzop"
62+
#COMPRESSION="lz4"
63+
COMPRESSION="zstd"
64+
65+
# COMPRESSION_OPTIONS
66+
# Additional options for the compressor
67+
#COMPRESSION_OPTIONS=()
+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#
2+
# SPDX-License-Identifier: GPL-3.0-or-later
3+
4+
# mkinitcpio preset file for the 'linux' package on archiso
5+
6+
PRESETS=('archiso')
7+
8+
ALL_kver='/boot/vmlinuz-linux'
9+
ALL_config='/etc/mkinitcpio.conf'
10+
11+
archiso_image="/boot/initramfs-linux.img"
+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# The broadcom-wl package requires some modules to be disabled in order to use
2+
# wl. Since the ISO image needs to cover many hardware cases, this file
3+
# overrides the default blacklist in /usr/lib/modprobe.d/
4+
#
5+
# If you need to use wl, you may need to delete this file, then `rmmod` any
6+
# already-loaded modules that are now blacklisted before proceeding to modprobe
7+
# wl itself.

airootfs/etc/motd

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
This ISO is based on Arch-ISO modified hugely to provide Installation Environment for EndeavourOS.
2+
https://endeavouros.com
3+
4+
EndeavourOS-archiso Sources:
5+
https://github.com/endeavouros-team/EndeavourOS-iso-next
6+
7+
Arch-ISO Source:
8+
https://gitlab.archlinux.org/archlinux/archiso
9+
10+
Calamares as our installer:
11+
https://github.com/calamares/calamares
12+
13+
Live environment will start now and let you install EndeavourOS to disk, or tryout XFCE4-Desktop from Live-Session.
14+
15+
Bugs can be reported here:
16+
https://forum.endeavouros.com/c/Arch-based-related-questions/bug-reports
17+
18+
Getting help at the forum: https://forum.endeavouros.com
19+
Help-Chat is available on telegram: https://t.me/Endeavouros/
20+
News at reddit: https://www.reddit.com/r/EndeavourOS/
21+
News at twitter: https://twitter.com/OsEndeavour
22+
23+
Our journey wouldn't be made possible without the generosity of our open collective community:
24+
https://opencollective.com/endeavouros
25+
26+
Thank you for donating your trust in us!
27+
28+
Welcome to your endeavour
29+
30+
---

airootfs/etc/pacman.conf

+107
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
#
2+
# /etc/pacman.conf
3+
#
4+
# See the pacman.conf(5) manpage for option and repository directives
5+
6+
#
7+
# GENERAL OPTIONS
8+
#
9+
[options]
10+
# The following paths are commented out with their default values listed.
11+
# If you wish to use different paths, uncomment and update the paths.
12+
#RootDir = /
13+
#DBPath = /var/lib/pacman/
14+
#CacheDir = /var/cache/pacman/pkg/
15+
#LogFile = /var/log/pacman.log
16+
#GPGDir = /etc/pacman.d/gnupg/
17+
#HookDir = /etc/pacman.d/hooks/
18+
HoldPkg = pacman glibc
19+
#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
20+
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
21+
#CleanMethod = KeepInstalled
22+
#UseDelta = 0.7
23+
Architecture = auto
24+
25+
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
26+
#IgnorePkg =
27+
#IgnoreGroup =
28+
29+
#NoUpgrade =
30+
#NoExtract =
31+
32+
# Misc options
33+
#UseSyslog
34+
Color
35+
ILoveCandy
36+
#NoProgressBar
37+
#CheckSpace
38+
VerbosePkgLists
39+
DisableDownloadTimeout
40+
ParallelDownloads = 5
41+
42+
# By default, pacman accepts packages signed by keys that its local keyring
43+
# trusts (see pacman-key and its man page), as well as unsigned packages.
44+
SigLevel = Required DatabaseOptional
45+
LocalFileSigLevel = Optional
46+
#RemoteFileSigLevel = Required
47+
48+
# NOTE: You must run `pacman-key --init` before first using pacman; the local
49+
# keyring can then be populated with the keys of all official Arch Linux
50+
# packagers with `pacman-key --populate archlinux`.
51+
52+
#
53+
# REPOSITORIES
54+
# - can be defined here or included from another file
55+
# - pacman will search repositories in the order defined here
56+
# - local/custom mirrors can be added here or in separate files
57+
# - repositories listed first will take precedence when packages
58+
# have identical names, regardless of version number
59+
# - URLs will have $repo replaced by the name of the current repo
60+
# - URLs will have $arch replaced by the name of the architecture
61+
#
62+
# Repository entries are of the format:
63+
# [repo-name]
64+
# Server = ServerName
65+
# Include = IncludePath
66+
#
67+
# The header [repo-name] is crucial - it must be present and
68+
# uncommented to enable the repo.
69+
#
70+
71+
# The testing repositories are disabled by default. To enable, uncomment the
72+
# repo name header and Include lines. You can add preferred servers immediately
73+
# after the header, and they will be used before the default mirrors.
74+
75+
#[testing]
76+
#Include = /etc/pacman.d/mirrorlist
77+
78+
[core]
79+
Include = /etc/pacman.d/mirrorlist
80+
81+
[extra]
82+
Include = /etc/pacman.d/mirrorlist
83+
84+
#[community-testing]
85+
#Include = /etc/pacman.d/mirrorlist
86+
87+
[community]
88+
Include = /etc/pacman.d/mirrorlist
89+
90+
# If you want to run 32 bit applications on your x86_64 system,
91+
# enable the multilib repositories as required here.
92+
93+
#[multilib-testing]
94+
#Include = /etc/pacman.d/mirrorlist
95+
96+
[multilib]
97+
Include = /etc/pacman.d/mirrorlist
98+
99+
[endeavouros]
100+
SigLevel = PackageRequired
101+
Include = /etc/pacman.d/endeavouros-mirrorlist
102+
103+
# An example of a custom package repository. See the pacman manpage for
104+
# tips on creating your own repositories.
105+
#[custom]
106+
#SigLevel = Optional TrustAll
107+
#Server = file:///home/custompkgs

airootfs/etc/passwd

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
root:x:0:0:root:/root:/bin/bash

airootfs/etc/shadow

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
root::14871::::::

0 commit comments

Comments
 (0)