deploypkg: add repo action check

.gitignore

@@ -4,3 +4,5 @@
 .kateproject.d
 data/schemas/*.conf
 .project
+iso-profiles
+live-services

Makefile

@@ -34,8 +34,6 @@ WITH-ISO = yes
 endif
 
 CPIODIR = $(SYSCONFDIR)/initcpio
-PROFDIR = $(DATADIR)/$(TOOLS)/iso-profiles/base
-OVERLAYDIR = $(PROFDIR)/live-overlay/etc
 
 SYSCONF = \
 	data/artools.conf
@@ -167,10 +165,7 @@ install_pkg:
 install_cpio:
 	+make CPIODIR=$(CPIODIR) DESTDIR=$(DESTDIR) -C initcpio install
 
-install_base_profile:
+install_iso: install_cpio
-	+make OVERLAYDIR=$(OVERLAYDIR) PROFDIR=$(PROFDIR) DESTDIR=$(DESTDIR) -C data/base install
-
-install_iso: install_cpio install_base_profile
 	install $(DIRMODE) $(DESTDIR)$(BINDIR)
 	install $(MODE) $(BIN_ISO) $(DESTDIR)$(BINDIR)
 
@@ -182,8 +177,6 @@ install_iso: install_cpio install_base_profile
 	install $(DIRMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
 	install $(FILEMODE) $(SHARED_ISO) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
-
-
 uninstall_base:
 	for f in $(notdir $(SYSCONF)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/$(TOOLS)/$$f; done
 	for f in $(notdir $(BIN_BASE)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
@@ -204,10 +197,7 @@ uninstall_pkg:
 uninstall_cpio:
 	+make CPIODIR=$(CPIODIR) DESTDIR=$(DESTDIR) -C initcpio uninstall
 
-uninstall_base_profile:
+uninstall_iso: uninstall_cpio
-	+make OVERLAYDIR=$(OVERLAYDIR) PROFDIR=$(PROFDIR) DESTDIR=$(DESTDIR) -C data/base uninstall
-
-uninstall_iso: uninstall_cpio uninstall_base_profile
 	for f in $(notdir $(BIN_ISO)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
 	for l in $(notdir $(BIN_ISO_SYMS)); do $(RM) $(DESTDIR)$(BINDIR)/$$l; done
 	for f in $(notdir $(LIBS_ISO)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done

bin/deploypkg.in

@@ -46,7 +46,7 @@ update_repo(){
         fi
     done
     cd $repo_path
-    repo-$action -R $repo.$ext ${packages[@]}
+    [[ -n $action ]] && repo-$action -R $repo.$ext ${packages[@]}
     return 0
 }
 

bin/mkchrootpkg.in

@@ -156,9 +156,10 @@ prepare_chroot() {
     # 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
     # 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/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}
 

data/base/Makefile

@@ -1,52 +0,0 @@
-DIRMODE = -dm0755
-FILEMODE = -m0644
-RMD = rm -fr --one-file-system
-RM = rm -f
-
-BASE = \
-	$(wildcard Packages-*) \
-	profile.conf
-
-LIVE_ETC = \
-	live-overlay/etc/fstab \
-	live-overlay/etc/issue
-
-LIVE_ETC_DEFAULT = \
-	$(wildcard live-overlay/etc/default/*)
-
-LIVE_ETC_PAM = \
-	$(wildcard live-overlay/etc/pam.d/*)
-
-LIVE_ETC_SUDOERS = \
-	$(wildcard live-overlay/etc/sudoers.d/*)
-
-install_isobase:
-	install $(DIRMODE) $(DESTDIR)$(PROFDIR)
-	install $(FILEMODE) $(BASE) $(DESTDIR)$(PROFDIR)
-
-	install $(DIRMODE) $(DESTDIR)$(OVERLAYDIR)
-	install $(FILEMODE) $(LIVE_ETC) $(DESTDIR)$(OVERLAYDIR)
-
-	install $(DIRMODE) $(DESTDIR)$(OVERLAYDIR)/default
-	install $(FILEMODE) $(LIVE_ETC_DEFAULT) $(DESTDIR)$(OVERLAYDIR)/default
-
-	install $(DIRMODE) $(DESTDIR)$(OVERLAYDIR)/pam.d
-	install $(FILEMODE) $(LIVE_ETC_PAM) $(DESTDIR)$(OVERLAYDIR)/pam.d
-
-	install $(DIRMODE) $(DESTDIR)$(OVERLAYDIR)/sudoers.d
-	install $(FILEMODE) $(LIVE_ETC_SUDOERS) $(DESTDIR)$(OVERLAYDIR)/sudoers.d
-
-uninstall_isobase:
-	for f in $(notdir $(BASE)); do $(RM) $(DESTDIR)$(PROFDIR)/$$f; done
-	for f in $(notdir $(LIVE_ETC)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/$$f; done
-	for f in $(notdir $(LIVE_ETC_DEFAULT)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/default/$$f; done
-	for f in $(notdir $(LIVE_ETC_PAM)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/pam.d/$$f; done
-	for f in $(notdir $(LIVE_ETC_SUDOERS)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/sudoers.d/$$f; done
-	$(RMD) $(DESTDIR)$(PROFDIR)
-
-
-install: install_isobase
-
-uninstall: uninstall_isobase
-
-.PHONY: install uninstall

data/base/Packages-Live

@@ -1,7 +0,0 @@
-mkinitcpio-nfs-utils
-nbd
->openrc artix-live-openrc
->runit artix-live-runit
-squashfs-tools
-artix-live-portable-efi
-linux-lts-headers

data/base/Packages-Root

@@ -1,97 +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
->runit runit-artix
->runit acpid-runit
->runit cronie-runit
->runit dbus-runit
->runit dhcpcd-runit
->runit elogind-runit
->runit haveged-runit
->runit lvm2-runit
->runit mdadm-runit
->runit nfs-utils-runit
->runit rsync-runit
->runit wpa_supplicant-runit
->runit 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

data/base/live-overlay/etc/default/grub

@@ -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"

data/base/live-overlay/etc/fstab

@@ -1,5 +0,0 @@
-#
-# /etc/fstab: static file system information
-#
-# <file system>        <dir>         <type>    <options>          <dump> <pass>
-/dev/mapper/rootfs /             auto      defaults           0      0

data/base/live-overlay/etc/issue

@@ -1,13 +0,0 @@
-
-Artix Live ISO (\l) - \s-\r \m
-
-
-
-# Welcome to Artix #
-
-
-login for the live environment:
-    user     'artix'
-    password 'artix'
-
-

data/base/live-overlay/etc/pam.d/su

@@ -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

data/base/live-overlay/etc/sudoers.d/g_wheel

@@ -1 +0,0 @@
-%wheel  ALL=(ALL) NOPASSWD: ALL

data/base/profile.conf

@@ -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"

data/pacman-default.conf

@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # 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
-# packagers with `pacman-key --populate archlinux cromnix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -63,6 +63,14 @@ LocalFileSigLevel = Optional
 #
 # The header [repo-name] is crucial - it must be present and
 # 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]
 Include = /etc/pacman.d/mirrorlist
@@ -70,15 +78,45 @@ Include = /etc/pacman.d/mirrorlist
 [world]
 Include = /etc/pacman.d/mirrorlist
 
+#[galaxy-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
 [galaxy]
 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
 #
 
+#[testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
 [extra]
 Include = /etc/pacman.d/mirrorlist-arch
 
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
 [community]
 Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/pacman-goblins.conf

@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # 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
-# packagers with `pacman-key --populate archlinux cromnix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -63,6 +63,11 @@ LocalFileSigLevel = Optional
 #
 # The header [repo-name] is crucial - it must be present and
 # 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]
 Include = /etc/pacman.d/mirrorlist
@@ -85,6 +90,24 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 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
 #
@@ -106,3 +129,12 @@ Include = /etc/pacman.d/mirrorlist-arch
 
 [community]
 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

data/pacman-gremlins.conf

@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # 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
-# packagers with `pacman-key --populate archlinux cromnix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -63,6 +63,11 @@ LocalFileSigLevel = Optional
 #
 # The header [repo-name] is crucial - it must be present and
 # 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
@@ -79,6 +84,21 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 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
 #
@@ -94,3 +114,9 @@ Include = /etc/pacman.d/mirrorlist-arch
 
 [community]
 Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist-arch

data/pacman-lib32-goblins.conf

@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # 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
-# packagers with `pacman-key --populate archlinux cromnix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -63,6 +63,11 @@ LocalFileSigLevel = Optional
 #
 # The header [repo-name] is crucial - it must be present and
 # 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]
 Include = /etc/pacman.d/mirrorlist
@@ -85,6 +90,9 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 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
 
@@ -94,6 +102,12 @@ 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
 #

data/pacman-lib32-gremlins.conf

@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # 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
-# packagers with `pacman-key --populate archlinux cromnix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -63,6 +63,11 @@ LocalFileSigLevel = Optional
 #
 # The header [repo-name] is crucial - it must be present and
 # 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
@@ -79,12 +84,21 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 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
 #

data/pacman-lib32.conf

@@ -44,7 +44,7 @@ LocalFileSigLevel = Optional
 
 # 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
-# packagers with `pacman-key --populate archlinux cromnix`.
+# packagers with `pacman-key --populate archlinux artix`.
 
 #
 # REPOSITORIES
@@ -63,6 +63,14 @@ LocalFileSigLevel = Optional
 #
 # The header [repo-name] is crucial - it must be present and
 # 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]
 Include = /etc/pacman.d/mirrorlist
@@ -70,21 +78,45 @@ Include = /etc/pacman.d/mirrorlist
 [world]
 Include = /etc/pacman.d/mirrorlist
 
+#[galaxy-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
 [galaxy]
 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
 #
 
+#[testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
 [extra]
 Include = /etc/pacman.d/mirrorlist-arch
 
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
 [community]
 Include = /etc/pacman.d/mirrorlist-arch
 
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist-arch
+
 [multilib]
 Include = /etc/pacman.d/mirrorlist-arch

lib/util-iso-profile.sh

@@ -8,29 +8,34 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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(){
     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"
 
@@ -44,11 +49,11 @@ load_profile(){
     [[ -z ${password} ]] && password="artix"
 
     if [[ -z ${addgroups} ]];then
-        addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,audio,log"
+        addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,log"
     fi
 
     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

lib/util-pkg.sh

@@ -35,7 +35,7 @@ patch_pkg(){
                 -e '/nscd.service/d' \
                 -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
         ;;
         'nvidia')