Add cryptsetup-runit

Revert "Remove cryptsetup-openrc from deps, add cryptsetup package"
This reverts commit d94172218e.
2019-02-16 21:50:43 +07:00 · 2019-02-16 21:49:52 +07:00 · 2019-02-15 19:37:56 +07:00 · 2018-10-23 00:44:14 +02:00 · 2018-10-09 16:54:31 +02:00
7 changed files with 66 additions and 155 deletions
--- a/89
+++ b/89
@@ -1,89 +0,0 @@
-VERSION=0.8
-
-PKG = iso-profiles
-TOOLS = artools
-ifdef PREFIX
-PREFIX = /usr/local
-endif
-SYSCONFDIR = /etc
-PROFDIR = $(PREFIX)/share/$(TOOLS)/$(PKG)
-
-BASEDIR = $(PROFDIR)/base
-OVERLAYDIR = $(BASEDIR)/live-overlay$(SYSCONFDIR)
-LXQTDIR = $(PROFDIR)/lxqt
-LXDEDOR = $(PROFDIR)/lxde
-
-DMODE = -dm0755
-FMODE = -m0644
-RM = rm -f
-RMD = rm -fr --one-file-system
-
-BASE = \
-	$(wildcard base/Packages-*) \
-	base/profile.conf
-
-LIVE = \
-	base/live-overlay/etc/fstab \
-	base/live-overlay/etc/issue
-
-LIVE_DEFAULT = \
-	$(wildcard base/live-overlay/etc/default/*)
-
-LIVE_PAM = \
-	$(wildcard base/live-overlay/etc/pam.d/*)
-
-LIVE_SUDOERS = \
-	$(wildcard base/live-overlay/etc/sudoers.d/*)
-
-LXQT = \
-	$(wildcard lxqt/Packages-*) \
-	lxqt/profile.conf
-
-LXQT_DM = \
-	lxqt/desktop-overlay/etc/sddm.conf
-
-install-base:
-	install $(DMODE) $(DESTDIR)$(BASEDIR)
-	install $(FMODE) $(BASE) $(DESTDIR)$(BASEDIR)
-
-	install $(DMODE) $(DESTDIR)$(OVERLAYDIR)
-	install $(FMODE) $(LIVE) $(DESTDIR)$(OVERLAYDIR)
-
-	install $(DMODE) $(DESTDIR)$(OVERLAYDIR)/default
-	install $(FMODE) $(LIVE_DEFAULT) $(DESTDIR)$(OVERLAYDIR)/default
-
-	install $(DMODE) $(DESTDIR)$(OVERLAYDIR)/pam.d
-	install $(FMODE) $(LIVE_PAM) $(DESTDIR)$(OVERLAYDIR)/pam.d
-
-	install $(DMODE) $(DESTDIR)$(OVERLAYDIR)/sudoers.d
-	install $(FMODE) $(LIVE_SUDOERS) $(DESTDIR)$(OVERLAYDIR)/sudoers.d
-
-install-lxqt:
-	install $(DMODE) $(DESTDIR)$(LXQTDIR)
-	install $(FMODE) $(LXQT) $(DESTDIR)$(LXQTDIR)
-	install $(DMODE)  $(DESTDIR)$(LXQTDIR)$(SYSCONFDIR)
-	install $(FMODE) $(LXQT_DM) $(DESTDIR)$(LXQTDIR)$(SYSCONFDIR)
-
-uninstall-base:
-	for f in $(notdir $(BASE)); do $(RM) $(DESTDIR)$(BASEDIR)/$$f; done
-	for f in $(notdir $(LIVE)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/$$f; done
-	for f in $(notdir $(LIVE_DEFAULT)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/default/$$f; done
-	for f in $(notdir $(LIVE_PAM)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/pam.d/$$f; done
-	for f in $(notdir $(LIVE_SUDOERS)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/sudoers.d/$$f; done
-	$(RMD) $(DESTDIR)$(BASEDIR)
-
-uninstall-lxqt:
-	for f in $(notdir $(LXQT)); do $(RM) $(DESTDIR)$(LXQTDIR)/$$f; done
-	for f in $(notdir $(LXQT_DM)); do $(RM) $(DESTDIR)$(LXQTDIR)$(SYSCONFDIR)/$$f; done
-	$(RMD) $(DESTDIR)$(LXQTDIR)
-
-install: install-lxqt install-base
-
-uninstall: uninstall-lxqt uninstall-base
-
-dist:
-	git archive --format=tar --prefix=$(PKG)-$(VERSION)/ $(VERSION) | gzip -9 > $(PKG)-$(VERSION).tar.gz
-	gpg --detach-sign --use-agent $(PKG)-$(VERSION).tar.gz
-
-.PHONY: install uninstall dist install-lxqt install-base uninstall-lxqt uninstall-base
-
--- a/base/Packages-Live
+++ b/base/Packages-Live
@@ -2,14 +2,17 @@ mkinitcpio-nfs-utils
 squashfs-tools
 nbd

->openrc artix-live-openrc
->runit artix-live-runit
+@openrc artix-live-openrc
+@runit artix-live-runit
 artix-live-portable-efi

->openrc networkmanager-openrc
->openrc ntp-openrc
->openrc bluez-openrc
+@openrc networkmanager-openrc
+@openrc ntp-openrc
+@openrc bluez-openrc

->runit networkmanager-runit
->runit ntp-runit
->runit bluez-runit
+@runit networkmanager-runit
+@runit ntp-runit
+@runit bluez-runit
+
+intel-ucode
+amd-ucode
--- a/base/Packages-Root
+++ b/base/Packages-Root
@@ -45,29 +45,30 @@ mkinitcpio-openswap
 nano
 net-tools
 ntfs-3g
->openrc acpid-openrc
->openrc cronie-openrc
->openrc cryptsetup-openrc
->openrc dhcpcd-openrc
->openrc haveged-openrc
->openrc lvm2-openrc
->openrc mdadm-openrc
->openrc nfs-utils-openrc
->openrc rsync-openrc
->openrc openssh-openrc
->openrc wpa_supplicant-openrc
->openrc syslog-ng-openrc
->runit acpid-runit
->runit cronie-runit
->runit dhcpcd-runit
->runit haveged-runit
->runit lvm2-runit
->runit mdadm-runit
->runit nfs-utils-runit
->runit rsync-runit
->runit openssh-runit
->runit wpa_supplicant-runit
->runit syslog-ng-runit
+@openrc acpid-openrc
+@openrc cronie-openrc
+@openrc cryptsetup-openrc
+@openrc dhcpcd-openrc
+@openrc haveged-openrc
+@openrc lvm2-openrc
+@openrc mdadm-openrc
+@openrc nfs-utils-openrc
+@openrc rsync-openrc
+@openrc openssh-openrc
+@openrc wpa_supplicant-openrc
+@openrc syslog-ng-openrc
+@runit acpid-runit
+@runit cronie-runit
+@runit cryptsetup-runit
+@runit dhcpcd-runit
+@runit haveged-runit
+@runit lvm2-runit
+@runit mdadm-runit
+@runit nfs-utils-runit
+@runit rsync-runit
+@runit openssh-runit
+@runit wpa_supplicant-runit
+@runit syslog-ng-runit
 artix-sysvcompat
 os-prober
 pacman
--- a/base/profile.conf
+++ b/base/profile.conf
@@ -2,24 +2,24 @@

 # default displaymanager: none
 # supported: lightdm, sddm, gdm, lxdm, mdm
-# displaymanager="none"
+# DISPLAYMANAGER="none"

 # Set to false to disable autologin in the livecd
-autologin="false"
+AUTOLOGIN="false"

 # start services
-# services=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')
+# SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')

 # default group membership
-# addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,log"
+# ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"

 ################# live-session #################

 # default value
-# hostname="artix"
+# HOST_NANE="artix"

 # default value
-# username="artix"
+# USER_NAME="artix"

 # default value
-# password="artix"
+# PASSWORD="artix"
--- a/lxqt/Packages-Desktop
+++ b/lxqt/Packages-Desktop
@@ -9,26 +9,25 @@ modemmanager
 network-manager-applet
 nss-mdns

->openrc alsa-utils-openrc
->openrc avahi-openrc
->openrc displaymanager-openrc
->openrc json-c
->openrc networkmanager-openrc
->openrc ntp-openrc
->openrc openrc-settingsd
->openrc bluez-openrc
+@openrc alsa-utils-openrc
+@openrc avahi-openrc
+@openrc displaymanager-openrc
+@openrc json-c
+@openrc networkmanager-openrc
+@openrc ntp-openrc
+@openrc openrc-settingsd
+@openrc bluez-openrc

->runit alsa-utils-runit
->runit avahi-runit
->runit sddm-runit
->runit json-c
->runit networkmanager-runit
->runit ntp-runit
->runit bluez-runit
+@runit alsa-utils-runit
+@runit avahi-runit
+@runit sddm-runit
+@runit json-c
+@runit networkmanager-runit
+@runit ntp-runit
+@runit bluez-runit

 librabbitmq-c
 libmongoc
-#python

 lxqt

--- a/lxqt/Packages-Live
+++ b/lxqt/Packages-Live
@@ -2,8 +2,8 @@ mkinitcpio-nfs-utils
 squashfs-tools
 nbd

->openrc artix-live-openrc
->runit artix-live-runit
+@openrc artix-live-openrc
+@runit artix-live-runit
 artix-live-portable-efi

 calamares-branding
--- a/lxqt/profile.conf
+++ b/lxqt/profile.conf
@@ -2,27 +2,24 @@

 # default displaymanager: none
 # supported: lightdm, sddm, gdm, lxdm, mdm
-displaymanager="sddm"
+DISPLAYMANAGER="sddm"

 # Set to false to disable autologin in the livecd
-# autologin="true"
+# AUTOLOGIN="true"

 # start services
-# services=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')
+# SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')

 # default group membership
-# addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,log"
-
-# calamares netgroups
-# netgroups_url="https://raw.githubusercontent.com/artix-linux/netgroups/master"
+# ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"

 ################# live-session #################

 # unset defaults to given value
-# hostname="artix"
+# HOST_NAME="artix"

 # unset defaults to given value
-# username="artix"
+# USER_NAME="artix"

 # unset defaults to given value
-# password="artix"
+# PASSWORD="artix"
Author	SHA1	Message	Date
Muhammad Herdiansyah	ed1b755a9c	Add cryptsetup-runit	2019-02-16 21:50:43 +07:00
Muhammad Herdiansyah	37619b95d4	Revert "Remove cryptsetup-openrc from deps, add cryptsetup package" This reverts commit `d94172218e`.	2019-02-16 21:49:52 +07:00
Muhammad Herdiansyah	d94172218e	Remove cryptsetup-openrc from deps, add cryptsetup package Since none of our isos use any encrypted partitions, we don't really need the initscript. However, we do need the binary (in case of encrypted root).	2019-02-15 19:37:56 +07:00
artoo	2a26281983	prepare 0.9	2018-10-23 00:44:14 +02:00
artoo	3b0ee9b414	use @ tag	2018-10-09 16:54:31 +02:00