Compare commits

..

50 Commits

Author SHA1 Message Date
ac672b1623 artixpkg: fix parallel agent setting on config
All checks were successful
Artools shellcheck / lint (push) Successful in 25s
2023-12-20 19:43:21 +01:00
d3af81c7ec artixpkg: remove left over agent msg
All checks were successful
Artools shellcheck / lint (push) Successful in 25s
2023-12-20 19:20:24 +01:00
5a7ddda12c artixpkg: small refactor of show_agent()
All checks were successful
Artools shellcheck / lint (push) Successful in 25s
2023-12-20 19:11:42 +01:00
17f079f4d5 mkchrootpkg: ensure builduser sudoers is set up properly
All checks were successful
Artools shellcheck / lint (push) Successful in 29s
2023-12-20 18:55:01 +01:00
ebb601d90f artixpkg: disable move checks
All checks were successful
Artools shellcheck / lint (push) Successful in 29s
2023-12-15 21:49:01 +01:00
bd5e8b403a manage-pkgbuild-keys: check the keyring for key existence on import
All checks were successful
Artools shellcheck / lint (push) Successful in 30s
2023-12-13 00:13:50 +01:00
ce17e42320 buildiso: fix shellcheck source path
All checks were successful
Artools shellcheck / lint (push) Successful in 28s
2023-12-11 21:06:04 +01:00
885f852ca8 config: update artools conf files
All checks were successful
Artools shellcheck / lint (push) Successful in 28s
2023-12-11 15:42:06 +01:00
3bb00c8c69 shellcheck 2023-12-11 03:30:36 +01:00
5862982bbb ci: update
All checks were successful
Artools shellcheck / lint (push) Successful in 27s
2023-12-11 02:27:28 +01:00
608c929d4f don't install iso profile.conf.example
All checks were successful
Artools shellcheck / lint (push) Successful in 49s
2023-12-11 02:11:06 +01:00
35bb702c78 mkchrootpkg: disable locale.conf shellcheck
All checks were successful
Artools shellcheck / lint (push) Successful in 1m22s
Artools shellcheck / lint (pull_request) Successful in 1m19s
2023-12-10 21:49:45 +01:00
1cebf87b28 ci: follow syms
Some checks failed
Artools shellcheck / lint (push) Failing after 1m18s
2023-12-10 21:04:35 +01:00
3d6d8cc255 buildiso: fix calamares services conf
Some checks failed
Artools shellcheck / lint (push) Failing after 9m7s
2023-12-10 20:52:33 +01:00
6c98f044af ci: set format 2023-12-10 20:24:46 +01:00
a342de8b30 ci: excludes
Some checks failed
Artools shellcheck / lint (push) Failing after 1m52s
2023-12-10 20:00:30 +01:00
de2bf041ae ci: only lint bin
Some checks failed
Artools shellcheck / lint (push) Failing after 54s
2023-12-10 19:52:51 +01:00
8c58b3fa26 fix ci
Some checks failed
Artools shellcheck / lint (push) Failing after 2m3s
2023-12-10 19:40:19 +01:00
85f1e1208b add ci
Some checks failed
Artools shellcheck / lint (push) Failing after 26s
2023-12-10 19:38:56 +01:00
1b7d3b6fdd readme: update iso deps 2023-12-10 19:22:15 +01:00
1d2d57e795 refactor: move yaml.sh in pkg module; use yq for calamares services conf 2023-12-10 19:21:00 +01:00
bec37d8236 makerepropkg: restore conf loading 2023-12-10 18:20:50 +01:00
3830037e44 ckchrootpkg: restore conf loading 2023-12-10 18:08:44 +01:00
acea4e1deb buildpkg: restore conf loading 2023-12-10 18:06:12 +01:00
87a95d998e readme: update to 0.32 2023-12-10 17:57:27 +01:00
38c0528697 rm base.conf 2023-12-10 17:52:19 +01:00
e8708ce0c5 small refactor; drop artools-base.conf, move mkchoot / chroot-run in pkg module 2023-12-10 17:41:20 +01:00
41947d9367 chroot-run: fix mount call 2023-12-10 16:52:50 +01:00
858a5f7aed fstabgen: shellcheck 2023-12-10 16:35:17 +01:00
718e2cfc7f artix-chroot & basestrap: arch patches backport; add unshare mode 2023-12-10 16:16:16 +01:00
e3c9a47c97 basestrap & artix-chroot: arch patches backport wip 2023-12-10 11:57:53 +01:00
7dd3f27c12 gstabgen: arch patches 2023-12-10 02:34:44 +01:00
6d5235a115 chroot-run: drop array in favor of string mount_args 2023-12-10 00:18:26 +01:00
b14524dca4 more shellcheck 2023-12-09 23:52:36 +01:00
5faa5ef599 buildiso: small refactoring & shellcheck 2023-12-09 22:47:34 +01:00
334a2c2487 more shellcheck 2023-12-08 17:56:03 +01:00
2bc6150221 shellcheck 2023-12-06 19:30:05 +01:00
645563b0c5 artixpkg: export keys on repo add 2023-12-06 17:31:04 +01:00
fb8da6fedd manage-pkgbuild-keys: small refactor 2023-12-06 01:08:19 +01:00
c31acae021 manage-pkgbuild-keys: standardize msgs 2023-12-06 00:21:42 +01:00
ca1082a8e5 pkg: add manage-pkgbuild-keys 2023-12-06 00:16:27 +01:00
6f12273730 artixpkg: show agent on repo import 2023-12-05 21:23:00 +01:00
b9b15f549d artixpkg: add msgs to show_agent() 2023-12-05 21:18:31 +01:00
c81b643fb2 artixpkg: add agent config to repo show cmd 2023-12-05 21:06:56 +01:00
4362707456 makepkg.conf: backport arch diff 2023-12-04 17:55:51 +01:00
5d8cdf19fe artixpkg: refactor pkgbuild sourcing in repo add 2023-12-03 19:40:56 +01:00
7084a086fa artixpkg: move check_pkgbuild_validity() in add 2023-12-03 19:38:09 +01:00
8744bb5355 artixpkg: check pkgbuild validity on add 2023-12-03 16:42:38 +01:00
75747a7d9d artixpkg: add remote changes check for add, move, remove 2023-12-03 16:39:05 +01:00
75d1e7ce2a start 0.32 2023-12-03 16:04:34 +01:00

View File

@@ -55,16 +55,8 @@ configure_calamares(){
if [[ -d "$mods" ]];then
msg2 "Configuring: Calamares"
write_services_"${INITSYS}"_conf "$mods"
sed -e "s|-openrc|-${INITSYS}|" -i "$1"/etc/calamares/settings.conf
if [[ -f "$mods"/netstrap.conf ]]; then
sed -e "s|-openrc|-${INITSYS}|g" -i "$mods"/netstrap.conf
fi
if [[ -f "$mods"/netinstall.conf ]]; then
sed -e "s|netinstall-openrc|netinstall-${INITSYS}|" -i "$mods"/netinstall.conf
fi
if [[ -f "$mods"/netinstall.yaml ]]; then
sed -e "s|-openrc|-${INITSYS}|g" -i "$mods"/netinstall.yaml
fi
sed -e "s|services-openrc|services-${INITSYS}|" \
-i "$1"/etc/calamares/settings.conf
fi
}