Compare commits
46 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
398e91bdd9 | ||
![]() |
d1f4c03e05 | ||
![]() |
180decbc5e | ||
![]() |
943c0c36ea | ||
![]() |
60116e9f93 | ||
![]() |
eea5d31427 | ||
![]() |
d05e8700ef | ||
![]() |
1d310e18e9 | ||
![]() |
baf290d3aa | ||
![]() |
1f379eec51 | ||
![]() |
c4d1425c46 | ||
![]() |
e5211838e8 | ||
![]() |
441c97730b | ||
![]() |
8ca984325a | ||
![]() |
3c4fc6e00b | ||
![]() |
20a20ee8bb | ||
2aae876d98 | |||
a19379596d | |||
![]() |
af8ab5fd1e | ||
![]() |
1c56ce7f8c | ||
![]() |
f80c5bf587 | ||
![]() |
d5c8af7025 | ||
![]() |
12a41ec0b2 | ||
![]() |
b5eb287867 | ||
![]() |
3e4fbd892e | ||
![]() |
dca96f29d7 | ||
![]() |
a382bdc83a | ||
![]() |
b73aec6031 | ||
![]() |
88f1145c96 | ||
![]() |
43bc1d149a | ||
![]() |
ffa532591c | ||
![]() |
f9f8ca6b68 | ||
![]() |
dbc3a94906 | ||
![]() |
8e4b5f88ca | ||
![]() |
104cc0b1ef | ||
![]() |
ce790fcaab | ||
![]() |
2d03e16a5f | ||
![]() |
64e0badbac | ||
![]() |
a94afab8a0 | ||
![]() |
1d3c77dc73 | ||
![]() |
1cccece399 | ||
![]() |
cc8b47912e | ||
![]() |
f36cf35d9a | ||
![]() |
cca5283db6 | ||
![]() |
d6bf8bcf12 | ||
![]() |
88886de9e9 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -4,3 +4,5 @@
|
|||||||
.kateproject.d
|
.kateproject.d
|
||||||
data/schemas/*.conf
|
data/schemas/*.conf
|
||||||
.project
|
.project
|
||||||
|
iso-profiles
|
||||||
|
live-services
|
||||||
|
229
Makefile
229
Makefile
@@ -1,9 +1,39 @@
|
|||||||
Version=0.7
|
VERSION=0.8
|
||||||
|
|
||||||
Chroot_version=0.7
|
CHROOT_VERSION=0.7
|
||||||
|
|
||||||
|
TOOLS = artools
|
||||||
|
ifdef PREFIX
|
||||||
PREFIX = /usr/local
|
PREFIX = /usr/local
|
||||||
|
endif
|
||||||
SYSCONFDIR = /etc
|
SYSCONFDIR = /etc
|
||||||
|
BINDIR = $(PREFIX)/bin
|
||||||
|
LIBDIR = $(PREFIX)/lib
|
||||||
|
DATADIR = $(PREFIX)/share
|
||||||
|
|
||||||
|
DIRMODE = -dm0755
|
||||||
|
FILEMODE = -m0644
|
||||||
|
MODE = -m0755
|
||||||
|
|
||||||
|
LN = ln -sf
|
||||||
|
RM = rm -f
|
||||||
|
RMD = rm -fr --one-file-system
|
||||||
|
M4 = m4 -P
|
||||||
|
CHMODAW = chmod a-w
|
||||||
|
CHMODX = chmod +x
|
||||||
|
|
||||||
|
ifdef WITH-PKG
|
||||||
|
WITH-PKG = no
|
||||||
|
else
|
||||||
|
WITH-PKG = yes
|
||||||
|
endif
|
||||||
|
ifdef WITH-ISO
|
||||||
|
WITH-ISO = no
|
||||||
|
else
|
||||||
|
WITH-ISO = yes
|
||||||
|
endif
|
||||||
|
|
||||||
|
CPIODIR = $(SYSCONFDIR)/initcpio
|
||||||
|
|
||||||
SYSCONF = \
|
SYSCONF = \
|
||||||
data/artools.conf
|
data/artools.conf
|
||||||
@@ -63,159 +93,138 @@ BIN_ISO = \
|
|||||||
bin/buildiso \
|
bin/buildiso \
|
||||||
bin/deployiso
|
bin/deployiso
|
||||||
|
|
||||||
|
BIN_ISO_SYMS = \
|
||||||
|
buildiso-gremlins \
|
||||||
|
buildiso-goblins
|
||||||
|
|
||||||
LIBS_ISO = \
|
LIBS_ISO = \
|
||||||
$(wildcard lib/util-iso*.sh)
|
$(wildcard lib/util-iso*.sh)
|
||||||
|
|
||||||
SHARED_ISO = \
|
SHARED_ISO = \
|
||||||
data/mkinitcpio.conf
|
data/mkinitcpio.conf
|
||||||
|
|
||||||
CPIOHOOKS = \
|
ifeq ($(WITH-PKG),yes)
|
||||||
$(wildcard initcpio/hooks/*)
|
|
||||||
|
|
||||||
CPIOINST = \
|
all: $(BIN_PKG)
|
||||||
$(wildcard initcpio/install/*)
|
|
||||||
|
|
||||||
CPIO = \
|
endif
|
||||||
initcpio/script/artix_shutdown
|
|
||||||
|
|
||||||
BASE = \
|
ifeq ($(WITH-ISO),yes)
|
||||||
$(wildcard data/base/Packages-*) \
|
|
||||||
data/base/profile.conf
|
|
||||||
|
|
||||||
LIVE_ETC = \
|
all: $(BIN_ISO)
|
||||||
data/base/live-overlay/etc/issue \
|
|
||||||
data/base/live-overlay/etc/fstab
|
|
||||||
|
|
||||||
LIVE_ETC_DEFAULT = \
|
endif
|
||||||
$(wildcard data/base/live-overlay/etc/default/*)
|
|
||||||
|
|
||||||
LIVE_ETC_PAM = \
|
all: $(BIN_BASE)
|
||||||
$(wildcard data/base/live-overlay/etc/pam.d/*)
|
|
||||||
|
|
||||||
LIVE_ETC_SUDOERS = \
|
EDIT = sed -e "s|@datadir[@]|$(DATADIR)/$(TOOLS)|g" \
|
||||||
$(wildcard data/base/live-overlay/etc/sudoers.d/*)
|
-e "s|@sysconfdir[@]|$(SYSCONFDIR)/$(TOOLS)|g" \
|
||||||
|
-e "s|@libdir[@]|$(LIBDIR)/$(TOOLS)|g" \
|
||||||
all: $(BIN_BASE) $(BIN_PKG) $(BIN_ISO)
|
-e "s|@version@|$(VERSION)|" \
|
||||||
|
-e "s|@chroot_version@|$(CHROOT_VERSION)|"
|
||||||
edit = sed -e "s|@datadir[@]|$(DESTDIR)$(PREFIX)/share/artools|g" \
|
|
||||||
-e "s|@sysconfdir[@]|$(DESTDIR)$(SYSCONFDIR)/artools|g" \
|
|
||||||
-e "s|@libdir[@]|$(DESTDIR)$(PREFIX)/lib/artools|g" \
|
|
||||||
-e "s|@version@|${Version}|" \
|
|
||||||
-e "s|@chroot_version@|${Chroot_version}|"
|
|
||||||
|
|
||||||
%: %.in Makefile
|
%: %.in Makefile
|
||||||
@echo "GEN $@"
|
@echo "GEN $@"
|
||||||
@$(RM) "$@"
|
@$(RM) "$@"
|
||||||
@m4 -P $@.in | $(edit) >$@
|
@$(M4) $@.in | $(EDIT) >$@
|
||||||
@chmod a-w "$@"
|
@$(CHMODAW) "$@"
|
||||||
@chmod +x "$@"
|
@$(CHMODX) "$@"
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(BIN_BASE) ${BIN_PKG} ${BIN_ISO}
|
$(RM) $(BIN_BASE) $(BIN_PKG) $(BIN_ISO)
|
||||||
|
|
||||||
install_base:
|
install_base:
|
||||||
install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools
|
install $(DIRMODE) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
|
||||||
install -m0644 ${SYSCONF} $(DESTDIR)$(SYSCONFDIR)/artools
|
install $(FILEMODE) $(SYSCONF) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/bin
|
install $(DIRMODE) $(DESTDIR)$(BINDIR)
|
||||||
install -m0755 ${BIN_BASE} $(DESTDIR)$(PREFIX)/bin
|
install $(MODE) $(BIN_BASE) $(DESTDIR)$(BINDIR)
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
|
install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
|
||||||
install -m0644 ${LIBS_BASE} $(DESTDIR)$(PREFIX)/lib/artools
|
install $(FILEMODE) $(LIBS_BASE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
|
install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
|
||||||
install -m0644 ${SHARED_BASE} $(DESTDIR)$(PREFIX)/share/artools
|
install $(FILEMODE) $(SHARED_BASE) $(DESTDIR)$(DATADIR)/$(TOOLS)
|
||||||
|
|
||||||
install_pkg:
|
install_pkg:
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/bin
|
install $(DIRMODE) $(DESTDIR)$(BINDIR)
|
||||||
install -m0755 ${BIN_PKG} $(DESTDIR)$(PREFIX)/bin
|
install $(MODE) $(BIN_PKG) $(DESTDIR)$(BINDIR)
|
||||||
|
|
||||||
ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
|
$(LN) find-libdeps $(DESTDIR)$(BINDIR)/find-libprovides
|
||||||
|
|
||||||
for l in ${COMMITPKG_SYMS}; do ln -sf commitpkg $(DESTDIR)$(PREFIX)/bin/$$l; done
|
for l in $(COMMITPKG_SYMS); do $(LN) commitpkg $(DESTDIR)$(BINDIR)/$$l; done
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
|
install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
|
||||||
install -m0644 ${LIBS_PKG} $(DESTDIR)$(PREFIX)/lib/artools
|
install $(FILEMODE) $(LIBS_PKG) $(DESTDIR)$(LIBDIR)/$(TOOLS)
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
|
install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
|
||||||
install -m0644 ${SHARED_PKG} $(DESTDIR)$(PREFIX)/share/artools
|
install $(FILEMODE) $(SHARED_PKG) $(DESTDIR)$(DATADIR)/$(TOOLS)
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/patches
|
install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
|
||||||
install -m0644 ${PATCHES} $(DESTDIR)$(PREFIX)/share/artools/patches
|
install $(FILEMODE) $(PATCHES) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches
|
||||||
|
install_cpio:
|
||||||
|
+make CPIODIR=$(CPIODIR) DESTDIR=$(DESTDIR) -C initcpio install
|
||||||
|
|
||||||
install_isobase:
|
install_iso: install_cpio
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
|
install $(DIRMODE) $(DESTDIR)$(BINDIR)
|
||||||
install -m0644 ${BASE} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
|
install $(MODE) $(BIN_ISO) $(DESTDIR)$(BINDIR)
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc
|
for l in $(BIN_ISO_SYMS); do $(LN) buildiso $(DESTDIR)$(BINDIR)/$$l; done
|
||||||
install -m0644 ${LIVE_ETC} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc
|
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/default
|
install $(DIRMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
|
||||||
install -m0644 ${LIVE_ETC_DEFAULT} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/default
|
install $(FILEMODE) $(LIBS_ISO) $(DESTDIR)$(LIBDIR)/$(TOOLS)
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/pam.d
|
install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
|
||||||
install -m0644 ${LIVE_ETC_PAM} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/pam.d
|
install $(FILEMODE) $(SHARED_ISO) $(DESTDIR)$(DATADIR)/$(TOOLS)
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/sudoers.d
|
|
||||||
install -m0644 ${LIVE_ETC_SUDOERS} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/sudoers.d
|
|
||||||
|
|
||||||
install_iso:
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/bin
|
|
||||||
install -m0755 ${BIN_ISO} $(DESTDIR)$(PREFIX)/bin
|
|
||||||
|
|
||||||
ln -sf buildiso $(DESTDIR)$(PREFIX)/bin/buildiso-gremlins
|
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
|
|
||||||
install -m0644 ${LIBS_ISO} $(DESTDIR)$(PREFIX)/lib/artools
|
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(SYSCONFDIR)/initcpio/hooks
|
|
||||||
install -m0755 ${CPIOHOOKS} $(DESTDIR)$(SYSCONFDIR)/initcpio/hooks
|
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(SYSCONFDIR)/initcpio/install
|
|
||||||
install -m0755 ${CPIOINST} $(DESTDIR)$(SYSCONFDIR)/initcpio/install
|
|
||||||
|
|
||||||
install -m0755 ${CPIO} $(DESTDIR)$(SYSCONFDIR)/initcpio
|
|
||||||
|
|
||||||
install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
|
|
||||||
install -m0644 ${SHARED_ISO} $(DESTDIR)$(PREFIX)/share/artools
|
|
||||||
|
|
||||||
uninstall_base:
|
uninstall_base:
|
||||||
for f in ${SYSCONF}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/$$f; done
|
for f in $(notdir $(SYSCONF)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)/$$f; done
|
||||||
for f in ${BIN_BASE}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
|
for f in $(notdir $(BIN_BASE)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
|
||||||
for f in ${SHARED_BASE}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
|
for f in $(notdir $(LIBS_BASE)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
|
||||||
for f in ${LIBS_BASE}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
|
for f in $(notdir $(SHARED_BASE)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/$$f; done
|
||||||
|
$(RMD) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)
|
||||||
|
$(RMD) $(DESTDIR)$(LIBDIR)/$(TOOLS)
|
||||||
|
$(RMD) $(DESTDIR)$(DATADIR)/$(TOOLS)
|
||||||
|
|
||||||
uninstall_pkg:
|
uninstall_pkg:
|
||||||
for f in ${BIN_PKG}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
|
for f in $(notdir $(BIN_PKG)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
|
||||||
rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
|
$(RM) $(DESTDIR)$(BINDIR)/find-libprovides
|
||||||
for l in ${COMMITPKG_SYMS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
|
for l in $(COMMITPKG_SYMS); do $(RM) $(DESTDIR)$(BINDIR)/$$l; done
|
||||||
for f in ${SHARED_PKG}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
|
for f in $(notdir $(LIBS_PKG)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
|
||||||
for f in ${PATCHES}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/patches/$$f; done
|
for f in $(notdir $(PATCHES)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/patches/$$f; done
|
||||||
for f in ${LIBS_PKG}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
|
for f in $(notdir $(SHARED_PKG)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/$$f; done
|
||||||
|
|
||||||
uninstall_isobase:
|
uninstall_cpio:
|
||||||
for f in ${BASE}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/$$f; done
|
+make CPIODIR=$(CPIODIR) DESTDIR=$(DESTDIR) -C initcpio uninstall
|
||||||
for f in ${LIVE_ETC}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/$$f; done
|
|
||||||
for f in ${LIVE_ETC_DEFAULT}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/default/$$f; done
|
|
||||||
for f in ${LIVE_ETC_PAM}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/pam.d/$$f; done
|
|
||||||
for f in ${LIVE_ETC_SUDOERS}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/sudoers.d/$$f; done
|
|
||||||
|
|
||||||
uninstall_iso:
|
uninstall_iso: uninstall_cpio
|
||||||
for f in ${BIN_ISO}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
|
for f in $(notdir $(BIN_ISO)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
|
||||||
rm -f $(DESTDIR)$(PREFIX)/bin/buildiso-gremlins
|
for l in $(notdir $(BIN_ISO_SYMS)); do $(RM) $(DESTDIR)$(BINDIR)/$$l; done
|
||||||
for f in ${SHARED_ISO}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
|
for f in $(notdir $(LIBS_ISO)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
|
||||||
|
for f in $(notdir $(SHARED_ISO)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/$$f; done
|
||||||
|
|
||||||
for f in ${LIBS_ISO}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
|
ifeq ($(WITH-PKG),yes)
|
||||||
for f in ${CPIOHOOKS}; do rm -f $(DESTDIR)$(SYSCONFDIR)/initcpio/hooks/$$f; done
|
|
||||||
for f in ${CPIOINST}; do rm -f $(DESTDIR)$(SYSCONFDIR)/initcpio/install/$$f; done
|
|
||||||
for f in ${CPIO}; do rm -f $(DESTDIR)$(SYSCONFDIR)/initcpio/$$f; done
|
|
||||||
|
|
||||||
install: install_base install_pkg install_iso install_isobase
|
install: install_pkg
|
||||||
|
|
||||||
uninstall: uninstall_base uninstall_pkg uninstall_iso uninstall_isobase
|
uninstall: uninstall_pkg
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(WITH-ISO),yes)
|
||||||
|
|
||||||
|
install: install_iso
|
||||||
|
|
||||||
|
uninstall: uninstall_iso
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
||||||
|
install: install_base
|
||||||
|
|
||||||
|
uninstall: uninstall_base
|
||||||
|
|
||||||
dist:
|
dist:
|
||||||
git archive --format=tar --prefix=artools-$(Version)/ $(Version) | gzip -9 > artools-$(Version).tar.gz
|
git archive --format=tar --prefix=$(TOOLS)-$(VERSION)/ $(VERSION) | gzip -9 > $(TOOLS)-$(VERSION).tar.gz
|
||||||
gpg --detach-sign --use-agent artools-$(Version).tar.gz
|
gpg --detach-sign --use-agent $(TOOLS)-$(VERSION).tar.gz
|
||||||
|
|
||||||
.PHONY: all clean install uninstall dist
|
.PHONY: all clean install uninstall dist
|
||||||
|
70
README.md
70
README.md
@@ -1,42 +1,72 @@
|
|||||||
artools
|
artools
|
||||||
=============
|
=============
|
||||||
|
|
||||||
User manual
|
#### Make flags
|
||||||
|
|
||||||
### 1. artools.conf
|
|
||||||
|
* PREFIX=/usr/local (default if defined)
|
||||||
|
* SYSCONFDIR=/etc
|
||||||
|
* WITH-PKG=yes
|
||||||
|
* WITH-ISO=yes
|
||||||
|
|
||||||
|
|
||||||
|
#### Dependencies
|
||||||
|
|
||||||
|
##### Buildtime:
|
||||||
|
|
||||||
|
* make
|
||||||
|
* git
|
||||||
|
* m4
|
||||||
|
|
||||||
|
##### Runtime:
|
||||||
|
|
||||||
|
- base:
|
||||||
|
|
||||||
|
* openssh
|
||||||
|
* rsync
|
||||||
|
* haveged
|
||||||
|
* os-prober
|
||||||
|
* gnupg
|
||||||
|
* pacman
|
||||||
|
|
||||||
|
- pkg:
|
||||||
|
|
||||||
|
* namcap
|
||||||
|
* git
|
||||||
|
|
||||||
|
- iso:
|
||||||
|
* dosfstools
|
||||||
|
* libisoburn
|
||||||
|
* squashfs-tools
|
||||||
|
* mkinitcpio
|
||||||
|
* mktorrent
|
||||||
|
* grub
|
||||||
|
|
||||||
|
#### Configuration
|
||||||
|
|
||||||
artools.conf is the central configuration file for artools.
|
artools.conf is the central configuration file for artools.
|
||||||
By default, the config is installed in
|
By default, the config is installed in
|
||||||
|
|
||||||
~~~
|
/etc/artools/artools.conf
|
||||||
/etc/artools/artools.conf
|
|
||||||
~~~
|
|
||||||
|
|
||||||
A user artools.conf can be placed in
|
A user artools.conf can be placed in
|
||||||
|
|
||||||
~~~
|
$HOME/.config/artools/artools.conf
|
||||||
$HOME/.config/artools/artools.conf
|
|
||||||
~~~
|
|
||||||
|
|
||||||
If the userconfig is present, artools will load the userconfig values, however, if variables have been set in the systemwide
|
If the userconfig is present, artools will load the userconfig values, however, if variables have been set in the systemwide
|
||||||
|
|
||||||
~~~
|
These values take precedence over the userconfig.
|
||||||
/etc/artools/artools.conf
|
|
||||||
~~~
|
|
||||||
|
|
||||||
these values take precedence over the userconfig.
|
|
||||||
Best practise is to leave systemwide file untouched.
|
Best practise is to leave systemwide file untouched.
|
||||||
By default it is commented and shows just initialization values done in code.
|
By default it is commented and shows just initialization values done in code.
|
||||||
|
|
||||||
Tools configuration is done in artools.conf or by args.
|
Tools configuration is done in artools.conf or by args.
|
||||||
Specifying args will override artools.conf settings.
|
Specifying args will override artools.conf settings.
|
||||||
|
|
||||||
~~~
|
Both, pacman.conf and makepkg.conf for chroots are loaded from
|
||||||
$HOME/.config/artools/import.list.d
|
|
||||||
~~~
|
|
||||||
|
|
||||||
overriding
|
/usr/share/artools/{makepkg,pacman-*}.conf
|
||||||
|
|
||||||
~~~
|
and can be overridden dropping them in
|
||||||
/etc/artools/import.list.d
|
|
||||||
~~~
|
$HOME/.config/artools/
|
||||||
|
@@ -29,7 +29,7 @@ prepare_build(){
|
|||||||
local pacman_conf pac_file="pacman-default.conf"
|
local pacman_conf pac_file="pacman-default.conf"
|
||||||
|
|
||||||
case "${stablility}" in
|
case "${stablility}" in
|
||||||
'gremlins') pac_file="pacman-${stablility}.conf" ;;
|
'gremlins'|'goblins') pac_file="pacman-${stablility}.conf" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
pacman_conf="${DATADIR}/$pac_file"
|
pacman_conf="${DATADIR}/$pac_file"
|
||||||
|
@@ -18,42 +18,36 @@ SYSCONFDIR='@sysconfdir@'
|
|||||||
import ${LIBDIR}/util.sh
|
import ${LIBDIR}/util.sh
|
||||||
import ${LIBDIR}/util-pkg.sh
|
import ${LIBDIR}/util-pkg.sh
|
||||||
|
|
||||||
del_from_repo(){
|
update_repo(){
|
||||||
local ver
|
local repo="$1" pkgfile ver ext=db.tar.xz
|
||||||
local repo="$1"
|
local repo_path=${repos_root}/$repo/os/${target_arch} packages=()
|
||||||
local repo_path=${repos_root}/$repo/os/${target_arch}
|
|
||||||
source PKGBUILD
|
source PKGBUILD
|
||||||
for name in ${pkgname[@]};do
|
for name in ${pkgname[@]};do
|
||||||
[[ $arch == any ]] && CARCH=any
|
[[ $arch == any ]] && CARCH=any
|
||||||
ver=$(get_full_version $name)
|
ver=$(get_full_version "$name")
|
||||||
if pkgfile=$(find_cached_package "$name" "$ver" "$CARCH");then
|
if pkgfile=$(find_cached_package "$name" "$ver" "$CARCH");then
|
||||||
info "pkgfile: %s" "${pkgfile##*/}"
|
local pkg=${pkgfile##*/}
|
||||||
repo-remove -R $repo_path/$repo.db.tar.xz $name
|
info "Found: %s" "$pkg"
|
||||||
[[ -e $repo_path/${pkgfile##*/} ]] && rm -v $repo_path/${pkgfile##*/}
|
if ${add_pkg};then
|
||||||
[[ -e $repo_path/${pkgfile##*/}.sig ]] && rm -v $repo_path/${pkgfile##*/}.sig
|
local action='add'
|
||||||
fi
|
packages+=("$pkg")
|
||||||
done
|
# checkpkg $pkg
|
||||||
}
|
if ${sign_pkg};then
|
||||||
|
[[ -e ${pkgfile}.sig ]] && rm ${pkgfile}.sig
|
||||||
add_to_repo(){
|
signfile ${pkgfile}
|
||||||
local ver pkgfile=
|
fi
|
||||||
local repo="$1"
|
ln -sf ${pkgfile}{,.sig} $repo_path/
|
||||||
local repo_path=${repos_root}/$repo/os/${target_arch}
|
elif ${del_pkg};then
|
||||||
source PKGBUILD
|
local action='remove'
|
||||||
for name in ${pkgname[@]};do
|
packages+=("$name")
|
||||||
[[ $arch == any ]] && CARCH=any
|
[[ -e $repo_path/$pkg ]] && rm $repo_path/$pkg
|
||||||
ver=$(get_full_version $name)
|
[[ -e $repo_path/$pkg.sig ]] && rm $repo_path/$pkg.sig
|
||||||
if pkgfile=$(find_cached_package "$name" "$ver" "$CARCH"); then
|
|
||||||
info "pkgfile: %s" "${pkgfile##*/}"
|
|
||||||
if ${sign_pkg};then
|
|
||||||
[[ -e ${pkgfile}.sig ]] && rm ${pkgfile}.sig
|
|
||||||
signfile ${pkgfile}
|
|
||||||
fi
|
fi
|
||||||
ln -sf ${pkgfile}{,.sig} $repo_path/
|
|
||||||
cd $repo_path
|
|
||||||
repo-add -R $repo.db.tar.xz ${pkgfile##*/}
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
cd $repo_path
|
||||||
|
[[ -n $action ]] && repo-$action -R $repo.$ext ${packages[@]}
|
||||||
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
display_settings(){
|
display_settings(){
|
||||||
@@ -84,9 +78,9 @@ sign_pkg=false
|
|||||||
usage() {
|
usage() {
|
||||||
echo "Usage: ${0##*/} [options]"
|
echo "Usage: ${0##*/} [options]"
|
||||||
echo " -d Destination repository [default:${repository}]"
|
echo " -d Destination repository [default:${repository}]"
|
||||||
echo ' -a Add package to repository'
|
echo ' -a Add package(s) to repository'
|
||||||
echo ' -r Remove package from repository'
|
echo ' -r Remove package(s) from repository'
|
||||||
echo ' -s Sign package'
|
echo ' -s Sign package(s)'
|
||||||
echo ' -q Query settings and pretend upload'
|
echo ' -q Query settings and pretend upload'
|
||||||
echo ' -h This help'
|
echo ' -h This help'
|
||||||
echo ''
|
echo ''
|
||||||
@@ -101,8 +95,8 @@ opts='d:arsqh'
|
|||||||
while getopts "${opts}" arg; do
|
while getopts "${opts}" arg; do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
d) repository="$OPTARG" ;;
|
d) repository="$OPTARG" ;;
|
||||||
a) add_pkg=true ;;
|
a) add_pkg=true; del_pkg=false ;;
|
||||||
r) del_pkg=true ;;
|
r) del_pkg=true; add_pkg=false ;;
|
||||||
s) sign_pkg=true ;;
|
s) sign_pkg=true ;;
|
||||||
q) pretend=true ;;
|
q) pretend=true ;;
|
||||||
h|?) usage 0 ;;
|
h|?) usage 0 ;;
|
||||||
@@ -116,8 +110,4 @@ prepare_dir "${repos_root}"
|
|||||||
|
|
||||||
${pretend} && display_settings && exit 1
|
${pretend} && display_settings && exit 1
|
||||||
|
|
||||||
${del_pkg} && del_from_repo "${repository}"
|
update_repo "${repository}"
|
||||||
|
|
||||||
${add_pkg} && add_to_repo "${repository}"
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
@@ -156,9 +156,10 @@ prepare_chroot() {
|
|||||||
# We can't use useradd without chrooting, otherwise it invokes PAM modules
|
# We can't use useradd without chrooting, otherwise it invokes PAM modules
|
||||||
# which we might not be able to load (i.e. when building i686 packages on
|
# which we might not be able to load (i.e. when building i686 packages on
|
||||||
# an x86_64 host).
|
# an x86_64 host).
|
||||||
sed -e '/^builduser:/d' -i "$copydir"/etc/{passwd,group}
|
sed -e '/^builduser:/d' -i "$copydir"/etc/{passwd,shadow,group}
|
||||||
printf >>"$copydir/etc/group" 'builduser:x:%d:\n' $builduser_gid
|
printf >>"$copydir/etc/group" 'builduser:x:%d:\n' $builduser_gid
|
||||||
printf >>"$copydir/etc/passwd" 'builduser:x:%d:%d:builduser:/build:/bin/bash\n' $builduser_uid $builduser_gid
|
printf >>"$copydir/etc/passwd" 'builduser:x:%d:%d:builduser:/build:/bin/bash\n' $builduser_uid $builduser_gid
|
||||||
|
printf >>"$copydir/etc/shadow" 'builduser:!!:%d::::::\n' "$(( $(date -u +%s) / 86400 ))"
|
||||||
|
|
||||||
$install -d "$copydir"/{build,build/.gnupg,startdir,{pkg,srcpkg,src,log}dest}
|
$install -d "$copydir"/{build,build/.gnupg,startdir,{pkg,srcpkg,src,log}dest}
|
||||||
|
|
||||||
|
@@ -1,8 +0,0 @@
|
|||||||
mkinitcpio-nfs-utils
|
|
||||||
nbd
|
|
||||||
>openrc artix-live-openrc
|
|
||||||
squashfs-tools
|
|
||||||
artix-live-portable-efi
|
|
||||||
virtualbox-guest-modules-artix
|
|
||||||
virtualbox-guest-utils
|
|
||||||
linux-lts-headers
|
|
@@ -1,84 +0,0 @@
|
|||||||
acpi
|
|
||||||
b43-fwcutter
|
|
||||||
bash
|
|
||||||
btrfs-progs
|
|
||||||
bzip2
|
|
||||||
coreutils
|
|
||||||
crda
|
|
||||||
dhclient
|
|
||||||
diffutils
|
|
||||||
dmraid
|
|
||||||
dnsmasq
|
|
||||||
dosfstools
|
|
||||||
e2fsprogs
|
|
||||||
ecryptfs-utils
|
|
||||||
exfat-utils
|
|
||||||
f2fs-tools
|
|
||||||
file
|
|
||||||
filesystem
|
|
||||||
findutils
|
|
||||||
gawk
|
|
||||||
gcc-libs
|
|
||||||
gettext
|
|
||||||
glibc
|
|
||||||
grep
|
|
||||||
grub
|
|
||||||
gzip
|
|
||||||
inetutils
|
|
||||||
#intel-ucode
|
|
||||||
iproute2
|
|
||||||
iptables
|
|
||||||
iputils
|
|
||||||
ipw2100-fw
|
|
||||||
ipw2200-fw
|
|
||||||
jfsutils
|
|
||||||
KERNEL
|
|
||||||
less
|
|
||||||
licenses
|
|
||||||
linux-firmware
|
|
||||||
logrotate
|
|
||||||
lsb-release
|
|
||||||
man-db
|
|
||||||
man-pages
|
|
||||||
memtest86+
|
|
||||||
mkinitcpio-openswap
|
|
||||||
nano
|
|
||||||
net-tools
|
|
||||||
ntfs-3g
|
|
||||||
>openrc acpid-openrc
|
|
||||||
>openrc cronie-openrc
|
|
||||||
>openrc cryptsetup-openrc
|
|
||||||
>openrc dbus-openrc
|
|
||||||
>openrc device-mapper-openrc
|
|
||||||
>openrc dhcpcd-openrc
|
|
||||||
>openrc elogind-openrc
|
|
||||||
>openrc haveged-openrc
|
|
||||||
>openrc lvm2-openrc
|
|
||||||
>openrc mdadm-openrc
|
|
||||||
>openrc netifrc
|
|
||||||
>openrc nfs-utils-openrc
|
|
||||||
>openrc rsync-openrc
|
|
||||||
>openrc wpa_supplicant-openrc
|
|
||||||
>openrc opentmpfiles
|
|
||||||
os-prober
|
|
||||||
pacman
|
|
||||||
pciutils
|
|
||||||
pcmciautils
|
|
||||||
perl
|
|
||||||
procps-ng
|
|
||||||
psmisc
|
|
||||||
reiserfsprogs
|
|
||||||
sed
|
|
||||||
shadow
|
|
||||||
s-nail
|
|
||||||
sudo
|
|
||||||
sysfsutils
|
|
||||||
tar
|
|
||||||
texinfo
|
|
||||||
usbutils
|
|
||||||
util-linux
|
|
||||||
which
|
|
||||||
efibootmgr
|
|
||||||
xfsprogs
|
|
||||||
zd1211-firmware
|
|
||||||
zsh
|
|
@@ -1,49 +0,0 @@
|
|||||||
GRUB_DEFAULT=saved
|
|
||||||
GRUB_TIMEOUT=5
|
|
||||||
GRUB_DISTRIBUTOR="Artix"
|
|
||||||
GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
|
|
||||||
GRUB_CMDLINE_LINUX=""
|
|
||||||
|
|
||||||
# If you want to enable the save default function, uncomment the following
|
|
||||||
# line, and set GRUB_DEFAULT to saved.
|
|
||||||
GRUB_SAVEDEFAULT=true
|
|
||||||
|
|
||||||
# Preload both GPT and MBR modules so that they are not missed
|
|
||||||
GRUB_PRELOAD_MODULES="part_gpt part_msdos"
|
|
||||||
|
|
||||||
# Uncomment to enable Hidden Menu, and optionally hide the timeout count
|
|
||||||
#GRUB_HIDDEN_TIMEOUT=5
|
|
||||||
#GRUB_HIDDEN_TIMEOUT_QUIET=true
|
|
||||||
|
|
||||||
# Uncomment to use basic console
|
|
||||||
GRUB_TERMINAL_INPUT=console
|
|
||||||
|
|
||||||
# Uncomment to disable graphical terminal
|
|
||||||
#GRUB_TERMINAL_OUTPUT=console
|
|
||||||
|
|
||||||
# The resolution used on graphical terminal
|
|
||||||
# note that you can use only modes which your graphic card supports via VBE
|
|
||||||
# you can see them in real GRUB with the command `vbeinfo'
|
|
||||||
GRUB_GFXMODE=auto
|
|
||||||
|
|
||||||
# Uncomment to allow the kernel use the same resolution used by grub
|
|
||||||
GRUB_GFXPAYLOAD_LINUX=keep
|
|
||||||
|
|
||||||
# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
|
|
||||||
# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
|
|
||||||
#GRUB_DISABLE_LINUX_UUID=true
|
|
||||||
|
|
||||||
# Uncomment to disable generation of recovery mode menu entries
|
|
||||||
GRUB_DISABLE_RECOVERY=true
|
|
||||||
|
|
||||||
# Uncomment and set to the desired menu colors. Used by normal and wallpaper
|
|
||||||
# modes only. Entries specified as foreground/background.
|
|
||||||
GRUB_COLOR_NORMAL="light-gray/black"
|
|
||||||
GRUB_COLOR_HIGHLIGHT="cyan/black"
|
|
||||||
|
|
||||||
# Uncomment one of them for the gfx desired, a image background or a gfxtheme
|
|
||||||
GRUB_BACKGROUND="/usr/share/grub/background.png"
|
|
||||||
#GRUB_THEME="/path/to/gfxtheme"
|
|
||||||
|
|
||||||
# Uncomment to get a beep at GRUB start
|
|
||||||
#GRUB_INIT_TUNE="480 440 1"
|
|
@@ -1,5 +0,0 @@
|
|||||||
#
|
|
||||||
# /etc/fstab: static file system information
|
|
||||||
#
|
|
||||||
# <file system> <dir> <type> <options> <dump> <pass>
|
|
||||||
/dev/mapper/root-image / auto defaults 0 0
|
|
@@ -1,13 +0,0 @@
|
|||||||
[H[2J
|
|
||||||
Artix Live ISO (\l) - \s-\r \m
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Welcome to Artix #
|
|
||||||
|
|
||||||
|
|
||||||
login for the live environment:
|
|
||||||
user 'artix'
|
|
||||||
password 'artix'
|
|
||||||
|
|
||||||
|
|
@@ -1,6 +0,0 @@
|
|||||||
#%PAM-1.0
|
|
||||||
auth sufficient pam_rootok.so
|
|
||||||
auth sufficient pam_wheel.so trust use_uid
|
|
||||||
auth required pam_unix.so
|
|
||||||
account required pam_unix.so
|
|
||||||
session required pam_unix.so
|
|
@@ -1 +0,0 @@
|
|||||||
%wheel ALL=(ALL) NOPASSWD: ALL
|
|
@@ -1,27 +0,0 @@
|
|||||||
################ install ################
|
|
||||||
|
|
||||||
# default displaymanager: none
|
|
||||||
# supported; lightdm, sddm, gdm, lxdm, mdm
|
|
||||||
# displaymanager="none"
|
|
||||||
|
|
||||||
# Set to false to disable autologin in the livecd
|
|
||||||
# autologin="true"
|
|
||||||
|
|
||||||
# service runlevels
|
|
||||||
# services=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
|
|
||||||
|
|
||||||
# default values
|
|
||||||
# addgroups="video,power,storage,optical,network,lp,scanner,wheel,users"
|
|
||||||
|
|
||||||
# netgroups_url="https://raw.githubusercontent.com/artix-linux/netgroups/master"
|
|
||||||
|
|
||||||
################# live-session #################
|
|
||||||
|
|
||||||
# default value
|
|
||||||
# hostname="artix"
|
|
||||||
|
|
||||||
# default value
|
|
||||||
# username="artix"
|
|
||||||
|
|
||||||
# default value
|
|
||||||
# password="artix"
|
|
@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
|
|||||||
|
|
||||||
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
||||||
# keyring can then be populated with the keys of all official Artix Linux
|
# keyring can then be populated with the keys of all official Artix Linux
|
||||||
# packagers with `pacman-key --populate archlinux cromnix`.
|
# packagers with `pacman-key --populate archlinux artix`.
|
||||||
|
|
||||||
#
|
#
|
||||||
# REPOSITORIES
|
# REPOSITORIES
|
||||||
@@ -63,6 +63,14 @@ LocalFileSigLevel = Optional
|
|||||||
#
|
#
|
||||||
# The header [repo-name] is crucial - it must be present and
|
# The header [repo-name] is crucial - it must be present and
|
||||||
# uncommented to enable the repo.
|
# uncommented to enable the repo.
|
||||||
|
#
|
||||||
|
|
||||||
|
# The gremlins repositories are disabled by default. To enable, uncomment the
|
||||||
|
# repo name header and Include lines. You can add preferred servers immediately
|
||||||
|
# after the header, and they will be used before the default mirrors.
|
||||||
|
|
||||||
|
#[gremlins]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
[system]
|
[system]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
@@ -70,15 +78,45 @@ Include = /etc/pacman.d/mirrorlist
|
|||||||
[world]
|
[world]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
#[galaxy-gremlins]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
[galaxy]
|
[galaxy]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
# If you want to run 32 bit applications on your x86_64 system,
|
||||||
|
# enable the lib32 repositories as required here.
|
||||||
|
|
||||||
|
#[lib32-gremlins]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
#[lib32]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
# An example of a custom package repository. See the pacman manpage for
|
||||||
|
# tips on creating your own repositories.
|
||||||
|
#[custom]
|
||||||
|
#SigLevel = Optional TrustAll
|
||||||
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
#
|
#
|
||||||
# ARCHLINUX
|
# ARCHLINUX
|
||||||
#
|
#
|
||||||
|
|
||||||
|
#[testing]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
[extra]
|
[extra]
|
||||||
Include = /etc/pacman.d/mirrorlist-arch
|
Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
|
#[community-testing]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
[community]
|
[community]
|
||||||
Include = /etc/pacman.d/mirrorlist-arch
|
Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
|
#[multilib-testing]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
|
#[multilib]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
|
|||||||
|
|
||||||
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
||||||
# keyring can then be populated with the keys of all official Artix Linux
|
# keyring can then be populated with the keys of all official Artix Linux
|
||||||
# packagers with `pacman-key --populate archlinux cromnix`.
|
# packagers with `pacman-key --populate archlinux artix`.
|
||||||
|
|
||||||
#
|
#
|
||||||
# REPOSITORIES
|
# REPOSITORIES
|
||||||
@@ -63,6 +63,11 @@ LocalFileSigLevel = Optional
|
|||||||
#
|
#
|
||||||
# The header [repo-name] is crucial - it must be present and
|
# The header [repo-name] is crucial - it must be present and
|
||||||
# uncommented to enable the repo.
|
# uncommented to enable the repo.
|
||||||
|
#
|
||||||
|
|
||||||
|
# The gremlins repositories are disabled by default. To enable, uncomment the
|
||||||
|
# repo name header and Include lines. You can add preferred servers immediately
|
||||||
|
# after the header, and they will be used before the default mirrors.
|
||||||
|
|
||||||
[goblins]
|
[goblins]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
@@ -85,6 +90,24 @@ Include = /etc/pacman.d/mirrorlist
|
|||||||
[galaxy]
|
[galaxy]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
# If you want to run 32 bit applications on your x86_64 system,
|
||||||
|
# enable the lib32 repositories as required here.
|
||||||
|
|
||||||
|
#[lib32-goblins]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
#[lib32-gremlins]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
#[lib32]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
# An example of a custom package repository. See the pacman manpage for
|
||||||
|
# tips on creating your own repositories.
|
||||||
|
#[custom]
|
||||||
|
#SigLevel = Optional TrustAll
|
||||||
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
#
|
#
|
||||||
# ARCHLINUX
|
# ARCHLINUX
|
||||||
#
|
#
|
||||||
@@ -106,3 +129,12 @@ Include = /etc/pacman.d/mirrorlist-arch
|
|||||||
|
|
||||||
[community]
|
[community]
|
||||||
Include = /etc/pacman.d/mirrorlist-arch
|
Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
|
#[multilib-staging]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
|
#[multilib-testing]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
|
#[multilib]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
|
|||||||
|
|
||||||
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
||||||
# keyring can then be populated with the keys of all official Artix Linux
|
# keyring can then be populated with the keys of all official Artix Linux
|
||||||
# packagers with `pacman-key --populate archlinux cromnix`.
|
# packagers with `pacman-key --populate archlinux artix`.
|
||||||
|
|
||||||
#
|
#
|
||||||
# REPOSITORIES
|
# REPOSITORIES
|
||||||
@@ -63,6 +63,11 @@ LocalFileSigLevel = Optional
|
|||||||
#
|
#
|
||||||
# The header [repo-name] is crucial - it must be present and
|
# The header [repo-name] is crucial - it must be present and
|
||||||
# uncommented to enable the repo.
|
# uncommented to enable the repo.
|
||||||
|
#
|
||||||
|
|
||||||
|
# The gremlins repositories are disabled by default. To enable, uncomment the
|
||||||
|
# repo name header and Include lines. You can add preferred servers immediately
|
||||||
|
# after the header, and they will be used before the default mirrors.
|
||||||
|
|
||||||
[gremlins]
|
[gremlins]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
@@ -79,6 +84,21 @@ Include = /etc/pacman.d/mirrorlist
|
|||||||
[galaxy]
|
[galaxy]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
# If you want to run 32 bit applications on your x86_64 system,
|
||||||
|
# enable the lib32 repositories as required here.
|
||||||
|
|
||||||
|
#[lib32-gremlins]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
#[lib32]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
# An example of a custom package repository. See the pacman manpage for
|
||||||
|
# tips on creating your own repositories.
|
||||||
|
#[custom]
|
||||||
|
#SigLevel = Optional TrustAll
|
||||||
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
#
|
#
|
||||||
# ARCHLINUX
|
# ARCHLINUX
|
||||||
#
|
#
|
||||||
@@ -94,3 +114,9 @@ Include = /etc/pacman.d/mirrorlist-arch
|
|||||||
|
|
||||||
[community]
|
[community]
|
||||||
Include = /etc/pacman.d/mirrorlist-arch
|
Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
|
#[multilib-testing]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
|
#[multilib]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
|
|||||||
|
|
||||||
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
||||||
# keyring can then be populated with the keys of all official Artix Linux
|
# keyring can then be populated with the keys of all official Artix Linux
|
||||||
# packagers with `pacman-key --populate archlinux cromnix`.
|
# packagers with `pacman-key --populate archlinux artix`.
|
||||||
|
|
||||||
#
|
#
|
||||||
# REPOSITORIES
|
# REPOSITORIES
|
||||||
@@ -63,6 +63,11 @@ LocalFileSigLevel = Optional
|
|||||||
#
|
#
|
||||||
# The header [repo-name] is crucial - it must be present and
|
# The header [repo-name] is crucial - it must be present and
|
||||||
# uncommented to enable the repo.
|
# uncommented to enable the repo.
|
||||||
|
#
|
||||||
|
|
||||||
|
# The gremlins repositories are disabled by default. To enable, uncomment the
|
||||||
|
# repo name header and Include lines. You can add preferred servers immediately
|
||||||
|
# after the header, and they will be used before the default mirrors.
|
||||||
|
|
||||||
[goblins]
|
[goblins]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
@@ -85,6 +90,9 @@ Include = /etc/pacman.d/mirrorlist
|
|||||||
[galaxy]
|
[galaxy]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
# If you want to run 32 bit applications on your x86_64 system,
|
||||||
|
# enable the lib32 repositories as required here.
|
||||||
|
|
||||||
[lib32-goblins]
|
[lib32-goblins]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
@@ -94,7 +102,13 @@ Include = /etc/pacman.d/mirrorlist
|
|||||||
[lib32]
|
[lib32]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
#
|
# An example of a custom package repository. See the pacman manpage for
|
||||||
|
# tips on creating your own repositories.
|
||||||
|
#[custom]
|
||||||
|
#SigLevel = Optional TrustAll
|
||||||
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
|
#
|
||||||
# ARCHLINUX
|
# ARCHLINUX
|
||||||
#
|
#
|
||||||
|
|
||||||
|
@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
|
|||||||
|
|
||||||
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
||||||
# keyring can then be populated with the keys of all official Artix Linux
|
# keyring can then be populated with the keys of all official Artix Linux
|
||||||
# packagers with `pacman-key --populate archlinux cromnix`.
|
# packagers with `pacman-key --populate archlinux artix`.
|
||||||
|
|
||||||
#
|
#
|
||||||
# REPOSITORIES
|
# REPOSITORIES
|
||||||
@@ -63,6 +63,11 @@ LocalFileSigLevel = Optional
|
|||||||
#
|
#
|
||||||
# The header [repo-name] is crucial - it must be present and
|
# The header [repo-name] is crucial - it must be present and
|
||||||
# uncommented to enable the repo.
|
# uncommented to enable the repo.
|
||||||
|
#
|
||||||
|
|
||||||
|
# The gremlins repositories are disabled by default. To enable, uncomment the
|
||||||
|
# repo name header and Include lines. You can add preferred servers immediately
|
||||||
|
# after the header, and they will be used before the default mirrors.
|
||||||
|
|
||||||
[gremlins]
|
[gremlins]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
@@ -79,13 +84,22 @@ Include = /etc/pacman.d/mirrorlist
|
|||||||
[galaxy]
|
[galaxy]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
# If you want to run 32 bit applications on your x86_64 system,
|
||||||
|
# enable the lib32 repositories as required here.
|
||||||
|
|
||||||
[lib32-gremlins]
|
[lib32-gremlins]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
[lib32]
|
[lib32]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
#
|
# An example of a custom package repository. See the pacman manpage for
|
||||||
|
# tips on creating your own repositories.
|
||||||
|
#[custom]
|
||||||
|
#SigLevel = Optional TrustAll
|
||||||
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
|
#
|
||||||
# ARCHLINUX
|
# ARCHLINUX
|
||||||
#
|
#
|
||||||
|
|
||||||
|
@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
|
|||||||
|
|
||||||
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
||||||
# keyring can then be populated with the keys of all official Artix Linux
|
# keyring can then be populated with the keys of all official Artix Linux
|
||||||
# packagers with `pacman-key --populate archlinux cromnix`.
|
# packagers with `pacman-key --populate archlinux artix`.
|
||||||
|
|
||||||
#
|
#
|
||||||
# REPOSITORIES
|
# REPOSITORIES
|
||||||
@@ -63,6 +63,14 @@ LocalFileSigLevel = Optional
|
|||||||
#
|
#
|
||||||
# The header [repo-name] is crucial - it must be present and
|
# The header [repo-name] is crucial - it must be present and
|
||||||
# uncommented to enable the repo.
|
# uncommented to enable the repo.
|
||||||
|
#
|
||||||
|
|
||||||
|
# The gremlins repositories are disabled by default. To enable, uncomment the
|
||||||
|
# repo name header and Include lines. You can add preferred servers immediately
|
||||||
|
# after the header, and they will be used before the default mirrors.
|
||||||
|
|
||||||
|
#[gremlins]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
[system]
|
[system]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
@@ -70,21 +78,45 @@ Include = /etc/pacman.d/mirrorlist
|
|||||||
[world]
|
[world]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
#[galaxy-gremlins]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
[galaxy]
|
[galaxy]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
|
# If you want to run 32 bit applications on your x86_64 system,
|
||||||
|
# enable the lib32 repositories as required here.
|
||||||
|
|
||||||
|
#[lib32-gremlins]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
[lib32]
|
[lib32]
|
||||||
Include = /etc/pacman.d/mirrorlist
|
Include = /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
#
|
# An example of a custom package repository. See the pacman manpage for
|
||||||
|
# tips on creating your own repositories.
|
||||||
|
#[custom]
|
||||||
|
#SigLevel = Optional TrustAll
|
||||||
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
|
#
|
||||||
# ARCHLINUX
|
# ARCHLINUX
|
||||||
#
|
#
|
||||||
|
|
||||||
|
#[testing]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
[extra]
|
[extra]
|
||||||
Include = /etc/pacman.d/mirrorlist-arch
|
Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
|
#[community-testing]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
[community]
|
[community]
|
||||||
Include = /etc/pacman.d/mirrorlist-arch
|
Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
|
#[multilib-testing]
|
||||||
|
#Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
|
||||||
[multilib]
|
[multilib]
|
||||||
Include = /etc/pacman.d/mirrorlist-arch
|
Include = /etc/pacman.d/mirrorlist-arch
|
||||||
|
31
initcpio/Makefile
Normal file
31
initcpio/Makefile
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
DIRMODE = -dm0755
|
||||||
|
MODE = -m0755
|
||||||
|
RM = rm -f
|
||||||
|
|
||||||
|
CPIOHOOKS = \
|
||||||
|
$(wildcard hooks/*)
|
||||||
|
|
||||||
|
CPIOINST = \
|
||||||
|
$(wildcard install/*)
|
||||||
|
|
||||||
|
SCRIPT = \
|
||||||
|
$(wildcard script/*)
|
||||||
|
|
||||||
|
install_initcpio:
|
||||||
|
install $(DIRMODE) $(DESTDIR)$(CPIODIR)/hooks
|
||||||
|
install $(MODE) $(CPIOHOOKS) $(DESTDIR)$(CPIODIR)/hooks
|
||||||
|
|
||||||
|
install $(DIRMODE) $(DESTDIR)$(CPIODIR)/install
|
||||||
|
install $(MODE) $(CPIOINST) $(DESTDIR)$(CPIODIR)/install
|
||||||
|
install $(MODE) $(SCRIPT) $(DESTDIR)$(CPIODIR)
|
||||||
|
|
||||||
|
uninstall_initcpio:
|
||||||
|
for f in $(notdir $(CPIOHOOKS)); do $(RM) $(DESTDIR)$(CPIODIR)/hooks/$$f; done
|
||||||
|
for f in $(notdir $(CPIOINST)); do $(RM) $(DESTDIR)$(CPIODIR)/install/$$f; done
|
||||||
|
for f in $(notdir $(SCRIPT)); do $(RM) $(DESTDIR)$(CPIODIR)/$$f; done
|
||||||
|
|
||||||
|
install: install_initcpio
|
||||||
|
|
||||||
|
uninstall: uninstall_initcpio
|
||||||
|
|
||||||
|
.PHONY: install uninstall
|
@@ -1,38 +0,0 @@
|
|||||||
#!/bin/ash
|
|
||||||
|
|
||||||
# /oldroot depends on things inside /oldroot/run/miso...
|
|
||||||
mkdir /oldrun
|
|
||||||
mount -n --move /oldroot/run /oldrun
|
|
||||||
|
|
||||||
# Unmount all mounts now.
|
|
||||||
#umount $(mount | awk '$3 ~/^\/oldroot/ {print $3}' | sort -r)
|
|
||||||
umount $(mount | awk '$3 ~/^\/oldroot/ {if($3 != "/run/miso/bootmnt") print $3}' | sort -r)
|
|
||||||
|
|
||||||
# Remove all dm-snapshot devices.
|
|
||||||
dmsetup remove_all
|
|
||||||
|
|
||||||
# Remove all loopback devices.
|
|
||||||
for _lup in $(grep ^/dev/loop /oldrun/miso/used_block_devices | tac); do
|
|
||||||
if ! losetup -d ${_lup} 2> /dev/null; then
|
|
||||||
umount -d ${_lup}
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# Unmount the space used to store *.cow.
|
|
||||||
umount /oldrun/miso/cowspace
|
|
||||||
|
|
||||||
# Unmount boot device if needed (no copytoram=y used)
|
|
||||||
if [[ ! -d /oldrun/miso/copytoram ]]; then
|
|
||||||
if [[ -d /oldrun/miso/img_dev ]]; then
|
|
||||||
umount /oldrun/miso/img_dev
|
|
||||||
else
|
|
||||||
umount /oldrun/miso/bootmnt
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# reboot / poweroff / halt, depending on the argument passed by init
|
|
||||||
# if something invalid is passed, we halt
|
|
||||||
case "$1" in
|
|
||||||
reboot|poweroff|halt) "$1" -f ;;
|
|
||||||
*) halt -f;;
|
|
||||||
esac
|
|
@@ -8,29 +8,34 @@
|
|||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
|
init_profile(){
|
||||||
|
local profdir="$1" prof="$2"
|
||||||
|
|
||||||
|
root_list="$profdir/base/Packages-Root"
|
||||||
|
root_overlay="$profdir/base/root-overlay"
|
||||||
|
live_list="$profdir/base/Packages-Live"
|
||||||
|
live_overlay="$profdir/base/live-overlay"
|
||||||
|
|
||||||
|
[[ -f "$profdir/$prof/Packages-Root" ]] && root_list="$profdir/$prof/Packages-Root"
|
||||||
|
[[ -d "$profdir/$prof/root-overlay" ]] && root_overlay="$profdir/$prof/root-overlay"
|
||||||
|
|
||||||
|
[[ -f "$profdir/$prof/Packages-Desktop" ]] && desktop_list="$profdir/$prof/Packages-Desktop"
|
||||||
|
[[ -d "$profdir/$prof/desktop-overlay" ]] && desktop_overlay="$profdir/$prof/desktop-overlay"
|
||||||
|
|
||||||
|
[[ -f "$profdir/$prof/Packages-Live" ]] && live_list="$profdir/$prof/Packages-Live"
|
||||||
|
[[ -d "$profdir/$prof/live-overlay" ]] && live_overlay="$profdir/$prof/live-overlay"
|
||||||
|
}
|
||||||
|
|
||||||
load_profile(){
|
load_profile(){
|
||||||
local prof="$1"
|
local prof="$1"
|
||||||
local profdir="${DATADIR}/iso-profiles/$prof"
|
local profdir="${DATADIR}/iso-profiles"
|
||||||
[[ "$prof" != 'base' ]] && profdir=${workspace_dir}/iso-profiles/$prof
|
[[ -d ${workspace_dir}/iso-profiles ]] && profdir=${workspace_dir}/iso-profiles
|
||||||
|
|
||||||
root_list="${DATADIR}/iso-profiles/base/Packages-Root"
|
init_profile "$profdir" "$prof"
|
||||||
[[ -f "$profdir/Packages-Root" ]] && root_list="$profdir/Packages-Root"
|
|
||||||
|
|
||||||
root_overlay="${DATADIR}/iso-profiles/base/root-overlay"
|
[[ -f $profdir/$prof/profile.conf ]] || return 1
|
||||||
[[ -d "$profdir/root-overlay" ]] && root_overlay="$profdir/root-overlay"
|
|
||||||
|
|
||||||
[[ -f "$profdir/Packages-Desktop" ]] && desktop_list="$profdir/Packages-Desktop"
|
[[ -r $profdir/$prof/profile.conf ]] && source $profdir/$prof/profile.conf
|
||||||
[[ -d "$profdir/desktop-overlay" ]] && desktop_overlay="$profdir/desktop-overlay"
|
|
||||||
|
|
||||||
live_list="${DATADIR}/iso-profiles/base/Packages-Live"
|
|
||||||
[[ -f "$profdir/Packages-Live" ]] && live_list="$profdir/Packages-Live"
|
|
||||||
|
|
||||||
live_overlay="${DATADIR}/iso-profiles/base/live-overlay"
|
|
||||||
[[ -d "$profdir/live-overlay" ]] && live_overlay="$profdir/live-overlay"
|
|
||||||
|
|
||||||
[[ -f $profdir/profile.conf ]] || return 1
|
|
||||||
|
|
||||||
[[ -r $profdir/profile.conf ]] && source $profdir/profile.conf
|
|
||||||
|
|
||||||
[[ -z ${displaymanager} ]] && displaymanager="none"
|
[[ -z ${displaymanager} ]] && displaymanager="none"
|
||||||
|
|
||||||
@@ -44,19 +49,24 @@ load_profile(){
|
|||||||
[[ -z ${password} ]] && password="artix"
|
[[ -z ${password} ]] && password="artix"
|
||||||
|
|
||||||
if [[ -z ${addgroups} ]];then
|
if [[ -z ${addgroups} ]];then
|
||||||
addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,audio"
|
addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,log"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z ${services[@]} ]];then
|
if [[ -z ${services[@]} ]];then
|
||||||
services=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
|
services=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ${displaymanager} != "none" ]];then
|
||||||
|
case "${initsys}" in
|
||||||
|
'openrc') services+=('xdm') ;;
|
||||||
|
'runit') services+=("${displaymanager}") ;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[[ ${displaymanager} != "none" ]] && services+=('xdm')
|
|
||||||
|
|
||||||
if [[ -z ${services_live[@]} ]];then
|
if [[ -z ${services_live[@]} ]];then
|
||||||
services_live=('artix-live' 'pacman-init')
|
services_live=('artix-live' 'pacman-init')
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[[ -z ${netgroups_url} ]] && netgroups_url="https://raw.githubusercontent.com/artix-linux/netgroups/master"
|
[[ -z ${netgroups_url} ]] && netgroups_url="https://raw.githubusercontent.com/artix-linux/netgroups/master"
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
|
@@ -27,14 +27,15 @@ write_bootloader_conf(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
write_servicescfg_conf(){
|
write_servicescfg_conf(){
|
||||||
local conf="$1/servicescfg.conf"
|
local conf="$1/servicescfg.conf" init="$2"
|
||||||
msg2 "Writing %s ..." "${conf##*/}"
|
msg2 "Writing %s ..." "${conf##*/}"
|
||||||
echo '---' > "$conf"
|
echo '---' > "$conf"
|
||||||
|
echo "initsys: $init" >> "$conf"
|
||||||
echo '' >> "$conf"
|
echo '' >> "$conf"
|
||||||
echo 'services:' >> "$conf"
|
echo 'services:' >> "$conf"
|
||||||
echo ' enabled:' >> "$conf"
|
echo ' enabled:' >> "$conf"
|
||||||
for s in ${services[@]};do
|
for svc in ${services[@]};do
|
||||||
echo " - name: $s" >> "$conf"
|
echo " - name: $svc" >> "$conf"
|
||||||
echo ' runlevel: default' >> "$conf"
|
echo ' runlevel: default' >> "$conf"
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
@@ -88,16 +89,14 @@ write_unpack_conf(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
configure_calamares(){
|
configure_calamares(){
|
||||||
local dest="$1" mods="$1/etc/calamares/modules"
|
local dest="$1" mods="$1/etc/calamares/modules" init="$2"
|
||||||
if [[ -d $dest/etc/calamares/modules ]];then
|
if [[ -d $dest/etc/calamares/modules ]];then
|
||||||
info "Configuring [Calamares]"
|
info "Configuring [Calamares]"
|
||||||
write_netinstall_conf "$mods"
|
write_netinstall_conf "$mods"
|
||||||
write_unpack_conf "$mods"
|
write_unpack_conf "$mods"
|
||||||
write_users_conf "$mods"
|
write_users_conf "$mods"
|
||||||
write_initcpio_conf "$mods"
|
write_initcpio_conf "$mods"
|
||||||
case ${initsys} in
|
write_servicescfg_conf "$mods" "$init"
|
||||||
'openrc') write_servicescfg_conf "$mods" ;;
|
|
||||||
esac
|
|
||||||
write_bootloader_conf "$mods"
|
write_bootloader_conf "$mods"
|
||||||
info "Done configuring [Calamares]"
|
info "Done configuring [Calamares]"
|
||||||
fi
|
fi
|
||||||
|
@@ -139,6 +139,14 @@ add_svc_rc(){
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
add_svc_runit(){
|
||||||
|
local mnt="$1" name="$2"
|
||||||
|
if [[ -d $mnt/etc/runit/sv/$name ]]; then
|
||||||
|
msg2 "Setting %s ..." "$name"
|
||||||
|
chroot $mnt ln -s /etc/runit/sv/$name /etc/runit/runsvdir/default &>/dev/null
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
set_xdm(){
|
set_xdm(){
|
||||||
if [[ -f $1/etc/conf.d/xdm ]];then
|
if [[ -f $1/etc/conf.d/xdm ]];then
|
||||||
local conf='DISPLAYMANAGER="'${displaymanager}'"'
|
local conf='DISPLAYMANAGER="'${displaymanager}'"'
|
||||||
@@ -173,6 +181,14 @@ configure_services(){
|
|||||||
add_svc_rc "$mnt" "$svc" "default"
|
add_svc_rc "$mnt" "$svc" "default"
|
||||||
done
|
done
|
||||||
;;
|
;;
|
||||||
|
'runit')
|
||||||
|
for svc in ${services[@]}; do
|
||||||
|
add_svc_runit "$mnt" "$svc"
|
||||||
|
done
|
||||||
|
for svc in ${services_live[@]}; do
|
||||||
|
add_svc_runit "$mnt" "$svc"
|
||||||
|
done
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
info "Done configuring [%s]" "${initsys}"
|
info "Done configuring [%s]" "${initsys}"
|
||||||
}
|
}
|
||||||
@@ -180,7 +196,7 @@ configure_services(){
|
|||||||
configure_system(){
|
configure_system(){
|
||||||
local mnt="$1"
|
local mnt="$1"
|
||||||
case ${initsys} in
|
case ${initsys} in
|
||||||
'openrc')
|
'openrc' | 'runit')
|
||||||
configure_logind "$mnt" "elogind"
|
configure_logind "$mnt" "elogind"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@@ -242,7 +258,7 @@ configure_live_image(){
|
|||||||
configure_hosts "$fs"
|
configure_hosts "$fs"
|
||||||
configure_system "$fs"
|
configure_system "$fs"
|
||||||
configure_services "$fs"
|
configure_services "$fs"
|
||||||
configure_calamares "$fs"
|
configure_calamares "$fs" "${initsys}"
|
||||||
write_live_session_conf "$fs"
|
write_live_session_conf "$fs"
|
||||||
msg "Done configuring [livefs]"
|
msg "Done configuring [livefs]"
|
||||||
}
|
}
|
||||||
@@ -388,6 +404,7 @@ gen_iso_fn(){
|
|||||||
local vars=() name
|
local vars=() name
|
||||||
vars+=("${iso_name}")
|
vars+=("${iso_name}")
|
||||||
vars+=("${profile}")
|
vars+=("${profile}")
|
||||||
|
[[ ${initsys} == 'runit' ]] && vars+=("${initsys}")
|
||||||
vars+=("${iso_version}")
|
vars+=("${iso_version}")
|
||||||
vars+=("${target_arch}")
|
vars+=("${target_arch}")
|
||||||
for n in ${vars[@]};do
|
for n in ${vars[@]};do
|
||||||
|
@@ -35,7 +35,7 @@ patch_pkg(){
|
|||||||
-e '/nscd.service/d' \
|
-e '/nscd.service/d' \
|
||||||
-i $pkg/trunk/PKGBUILD
|
-i $pkg/trunk/PKGBUILD
|
||||||
;;
|
;;
|
||||||
'tp_smapi'|'acpi_call'|'r8168'|'bbswitch')
|
'tp_smapi'|'acpi_call'|'r8168'|'bbswitch'|'broadcom-wl')
|
||||||
sed -e 's|-ARCH|-ARTIX|g' -i $pkg/trunk/PKGBUILD
|
sed -e 's|-ARCH|-ARTIX|g' -i $pkg/trunk/PKGBUILD
|
||||||
;;
|
;;
|
||||||
'nvidia')
|
'nvidia')
|
||||||
@@ -124,72 +124,72 @@ is_valid_repo(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
find_repo(){
|
find_repo(){
|
||||||
local pkg="$1" unstable="$2" repo=
|
local pkg="$1" incl="$2" repo=
|
||||||
|
|
||||||
if [[ -d $pkg/repos/core-x86_64 ]];then
|
if [[ -f $pkg/repos/core-x86_64/PKGBUILD ]];then
|
||||||
repo=core-x86_64
|
repo=core-x86_64
|
||||||
elif [[ -d $pkg/repos/core-any ]];then
|
elif [[ -f $pkg/repos/core-any/PKGBUILD ]];then
|
||||||
repo=core-any
|
repo=core-any
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -d $pkg/repos/extra-x86_64 ]];then
|
if [[ -f $pkg/repos/extra-x86_64/PKGBUILD ]];then
|
||||||
repo=extra-x86_64
|
repo=extra-x86_64
|
||||||
elif [[ -d $pkg/repos/extra-any ]];then
|
elif [[ -f $pkg/repos/extra-any/PKGBUILD ]];then
|
||||||
repo=extra-any
|
repo=extra-any
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -d $pkg/repos/testing-x86_64 ]];then
|
if [[ -f $pkg/repos/testing-x86_64/PKGBUILD ]];then
|
||||||
repo=testing-x86_64
|
repo=testing-x86_64
|
||||||
elif [[ -d $pkg/repos/testing-any ]];then
|
elif [[ -f $pkg/repos/testing-any/PKGBUILD ]];then
|
||||||
repo=testing-any
|
repo=testing-any
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -d $pkg/repos/staging-x86_64 ]];then
|
if [[ -f $pkg/repos/staging-x86_64/PKGBUILD ]];then
|
||||||
repo=staging-x86_64
|
repo=staging-x86_64
|
||||||
elif [[ -d $pkg/repos/staging-any ]];then
|
elif [[ -f $pkg/repos/staging-any/PKGBUILD ]];then
|
||||||
repo=staging-any
|
repo=staging-any
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -d $pkg/repos/community-x86_64 ]];then
|
if [[ -f $pkg/repos/community-x86_64/PKGBUILD ]];then
|
||||||
repo=community-x86_64
|
repo=community-x86_64
|
||||||
elif [[ -d $pkg/repos/community-any ]];then
|
elif [[ -f $pkg/repos/community-any/PKGBUILD ]];then
|
||||||
repo=community-any
|
repo=community-any
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -d $pkg/repos/community-testing-x86_64 ]];then
|
if [[ -f $pkg/repos/community-testing-x86_64/PKGBUILD ]];then
|
||||||
repo=community-testing-x86_64
|
repo=community-testing-x86_64
|
||||||
elif [[ -d $pkg/repos/community-testing-any ]];then
|
elif [[ -f $pkg/repos/community-testing-any/PKGBUILD ]];then
|
||||||
repo=community-testing-any
|
repo=community-testing-any
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -d $pkg/repos/community-staging-x86_64 ]];then
|
if [[ -f $pkg/repos/community-staging-x86_64/PKGBUILD ]];then
|
||||||
repo=community-staging-x86_64
|
repo=community-staging-x86_64
|
||||||
elif [[ -d $pkg/repos/community-staging-any ]];then
|
elif [[ -f $pkg/repos/community-staging-any/PKGBUILD ]];then
|
||||||
repo=community-staging-any
|
repo=community-staging-any
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -d $pkg/repos/multilib-x86_64 ]];then
|
if [[ -f $pkg/repos/multilib-x86_64/PKGBUILD ]];then
|
||||||
repo=multilib-x86_64
|
repo=multilib-x86_64
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -d $pkg/repos/multilib-testing-x86_64 ]];then
|
if [[ -f $pkg/repos/multilib-testing-x86_64/PKGBUILD ]];then
|
||||||
repo=multilib-testing-x86_64
|
repo=multilib-testing-x86_64
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -d $pkg/repos/multilib-staging-x86_64 ]];then
|
if [[ -f $pkg/repos/multilib-staging-x86_64/PKGBUILD ]];then
|
||||||
repo=multilib-staging-x86_64
|
repo=multilib-staging-x86_64
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if $unstable;then
|
if $incl;then
|
||||||
if [[ -d $pkg/repos/gnome-unstable-x86_64 ]];then
|
if [[ -f $pkg/repos/gnome-unstable-x86_64/PKGBUILD ]];then
|
||||||
repo=gnome-unstable-x86_64
|
repo=gnome-unstable-x86_64
|
||||||
elif [[ -d $pkg/repos/gnome-unstable-any ]];then
|
elif [[ -f $pkg/repos/gnome-unstable-any/PKGBUILD ]];then
|
||||||
repo=gnome-unstable-any
|
repo=gnome-unstable-any
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -d $pkg/repos/kde-unstable-x86_64 ]];then
|
if [[ -f $pkg/repos/kde-unstable-x86_64/PKGBUILD ]];then
|
||||||
repo=kde-unstable-x86_64
|
repo=kde-unstable-x86_64
|
||||||
elif [[ -d $pkg/repos/kde-unstable-any ]];then
|
elif [[ -f $pkg/repos/kde-unstable-any/PKGBUILD ]];then
|
||||||
repo=kde-unstable-any
|
repo=kde-unstable-any
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user