live (#6)

set service paths via make

use more make vars

fix session & desktop detection

move liveuser declare

shellcheck

update sysusers

make the live user configurable with make

cleanup log

properly copy user skel

create live home

add sysusers file

refactor

v0.10

update live.conf

artix-live: remove some config

use m4_include()

Reviewed-on: artix/live-services#6
Co-Authored-By: artoo <artoo@artixlinux.org>
Co-Committed-By: artoo <artoo@artixlinux.org>

LICENSE

@@ -1,6 +1,6 @@
 BSD 2-Clause License
 
-Copyright (c) 2017, Cromnix GNU/Linux
+Copyright (c) 2018-2019, Artix Linux
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -1,13 +1,23 @@
-Version=0.1
+VERSION = 0.10
+
+PKG = live-services
+TOOLS = artools
 
-PREFIX = /usr/local
 SYSCONFDIR = /etc
+PREFIX ?= /usr
+BINDIR = $(PREFIX)/bin
+LIBDIR = $(PREFIX)/lib
+DATADIR = $(PREFIX)/share
+SYSUSERSDIR = $(PREFIX)/lib/sysusers.d
+LIVEUSER ?= artix
+
+FMODE = -m0644
+DMODE = -dm0755
+BMODE = -m0755
 
 BIN = \
 	bin/artix-live
 
-LIBS = $(wildcard lib/*.sh)
-
 SHARED = \
 	$(wildcard data/*.map) \
 	data/live.conf
@@ -17,67 +27,99 @@ RC = \
 	data/rc/pacman-init \
 	data/rc/artix-live
 
-GRUB_DEFAULT = \
+RUNIT_SVD = \
-	data/grub2-portable-efi
+	data/runit/live
 
-GRUB_D = \
+RUNIT_SV = \
-	data/99_zzz-portable-efi
+	data/runit/pacman-init.run
 
-all: $(BIN) $(RC) $(XBIN) ${GRUB_D}
+S6_LIVE = \
+	data/s6/artix-live/up \
+	data/s6/artix-live/type
 
-edit = sed -e "s|@datadir[@]|$(DESTDIR)$(PREFIX)/share/artools|g" \
+S6_PI = \
-	-e "s|@sysconfdir[@]|$(DESTDIR)$(SYSCONFDIR)/artools|g" \
+	data/s6/pacman-init/type \
-	-e "s|@libdir[@]|$(DESTDIR)$(PREFIX)/lib/artools|g"
+	data/s6/pacman-init/up \
+	data/s6/pacman-init/down
 
-%: %.in Makefile
+S6_BUNDLE = \
+	data/s6/live/type \
+	data/s6/live/contents
+
+XDG = $(wildcard data/*.desktop)
+
+XBIN = bin/desktop-items
+
+SYSUSERS = \
+	data/sysusers
+
+RM = rm -f
+M4 = m4 -P
+CHMODAW = chmod a-w
+CHMODX = chmod +x
+
+all: $(BIN) $(SYSUSERS) $(XBIN) $(RC) $(RUNIT_SVD) $(S6_PI) $(S6_LIVE)
+
+EDIT = sed -e "s|@datadir[@]|$(DATADIR)|g" \
+	-e "s|@sysconfdir[@]|$(SYSCONFDIR)|g" \
+	-e "s|@bindir[@]|$(BINDIR)|g" \
+	-e "s|@libdir[@]|$(LIBDIR)|g" \
+	-e "s|@live[@]|$(LIVEUSER)|g"
+
+%: %.in Makefile lib/util-live.sh
 	@echo "GEN $@"
 	@$(RM) "$@"
-	@m4 -P $@.in | $(edit) >$@
+	@{ echo -n 'm4_changequote([[[,]]])'; cat $@.in; } | $(M4) | $(EDIT) >$@
-	@chmod a-w "$@"
+	@$(CHMODAW) "$@"
-	@chmod +x "$@"
+	@$(CHMODX) "$@"
+	@bash -O extglob -n "$@"
 
 clean:
-	rm -f $(BIN) $(RC) ${GRUB_D}
+	$(RM) $(BIN) $(SYSUSERS) $(XBIN) $(RC) $(RUNIT_SVD) $(S6_PI) $(S6_LIVE)
 
 install_base:
-	install -dm0755 $(DESTDIR)$(PREFIX)/bin
+	install $(DMODE) $(DESTDIR)$(BINDIR)
-	install -m0755 ${BIN} $(DESTDIR)$(PREFIX)/bin
+	install $(BMODE) $(BIN) $(DESTDIR)$(BINDIR)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
+	install $(DMODE) $(DESTDIR)$(SYSUSERSDIR)
-	install -m0644 ${LIBS} $(DESTDIR)$(PREFIX)/lib/artools
+	install $(FMODE) $(SYSUSERS) $(DESTDIR)$(SYSUSERSDIR)/live-artix.conf
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
+	install $(DMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
-	install -m0644 ${SHARED} $(DESTDIR)$(PREFIX)/share/artools
+	install $(FMODE) $(SHARED) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
 install_rc:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/init.d
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/init.d
-	install -m0755 ${RC} $(DESTDIR)$(SYSCONFDIR)/init.d
+	install $(BMODE) $(RC) $(DESTDIR)$(SYSCONFDIR)/init.d
 
-install_portable_efi:
+install_runit:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/default
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/rc/sysinit
-	install -m0755 $(GRUB_DEFAULT) $(DESTDIR)$(SYSCONFDIR)/default
+	install $(DMODE) $(DESTDIR)$(LIBDIR)/rc/sv.d
 
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/grub.d
+	install $(BMODE) $(RUNIT_SVD) $(DESTDIR)$(LIBDIR)/rc/sv.d
-	install -m0755 $(GRUB_D) $(DESTDIR)$(SYSCONFDIR)/grub.d
+	ln -sf $(LIBDIR)/rc/sv.d/live $(DESTDIR)$(SYSCONFDIR)/rc/sysinit/98-live
 
-uninstall_base:
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init
-	for f in ${BIN}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
+	install $(BMODE) $(RUNIT_SV) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init/run
-	for f in ${SHARED}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
-	for f in ${LIBS}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
 
-uninstall_portable_efi:
+install_s6:
-	for f in ${GRUB_DEFAULT}; do rm -f $(DESTDIR)$(SYSCONFDIR)/default/$$f; done
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv
-	for f in ${GRUB_D}; do rm -f $(DESTDIR)$(SYSCONFDIR)/grub.d/$$f; done
 
-uninstall_rc:
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/pacman-init
-	for f in ${RC}; do rm -f $(DESTDIR)$(SYSCONFDIR)/init.d/$$f; done
+	install $(BMODE) $(S6_PI) $(DESTDIR)$(SYSCONFDIR)/s6/sv/pacman-init/
 
-install: install_base install_rc install_portable_efi
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live
+	install $(BMODE) $(S6_LIVE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live/
 
-uninstall: uninstall_base uninstall_rc uninstall_portable_efi
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/live
+	install $(BMODE) $(S6_BUNDLE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/live/
 
-dist:
+install_xdg:
-	git archive --format=tar --prefix=live-services-$(Version)/ $(Version) | gzip -9 > live-services-$(Version).tar.gz
+	install -dm0755 $(DESTDIR)$(PREFIX)/bin
-	gpg --detach-sign --use-agent live-services-$(Version).tar.gz
+	install -m0755 ${XBIN} $(DESTDIR)$(PREFIX)/bin
 
-.PHONY: all clean install uninstall dist
+	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/skel/.config/autostart
+	install -m0755 ${XDG} $(DESTDIR)$(SYSCONFDIR)/skel/.config/autostart
+
+install: install_base install_rc install_runit install_s6 install_xdg
+
+.PHONY: install

bin/artix-live.in

@@ -1,62 +1,23 @@
-#!/bin/sh
+#!/bin/bash
+
+m4_include(lib/util-live.sh)
 
-LIBDIR='@libdir@'
-DATADIR='@datadir@'
-SYSCONFDIR='@sysconfdir@'
 LOGFILE='/var/log/artix-live.log'
 
-export LC_MESSAGES=C
-export LANG=C
-
-livetimer=$(date +%s%3N)
-
-[[ -r ${LIBDIR}/util-live.sh ]] && source ${LIBDIR}/util-live.sh
-
-load_live_config "${SYSCONFDIR}/live.conf" || load_live_config "${DATADIR}/live.conf"
-
-livetimer=$(get_timer_ms)
-detect_desktop_env
-echo "Detected ${default_desktop_executable} ${default_desktop_file}: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
-livetimer=$(get_timer_ms)
 CONSOLEFONT="$(kernel_cmdline vconsole.font)"
 CONSOLEMAP="$(kernel_cmdline vconsole.font.map)"
-arch=$(uname -m)
+#echo "Got consolefont ${CONSOLEFONT} and consolemap ${CONSOLEMAP}" >> "${LOGFILE}"
-echo "Got consolefont and arch $arch: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
-# Activate swap
-livetimer=$(get_timer_ms)
 configure_swap
-echo "Activated swap and added to fstab: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
-livetimer=$(get_timer_ms)
 configure_language
-echo "Finished localization: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
-livetimer=$(get_timer_ms)
 configure_user
-echo "Created user ${username} with password ${password}: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
-livetimer=$(get_timer_ms)
+detect_desktop_env
-configure_sudoers_d
-echo "Configured sudoers: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
-# livetimer=$(get_timer_ms)
+configure_accountsservice
-# configure_machine_id
-# echo "Configured machine-id: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
-livetimer=$(get_timer_ms)
-configure_accountsservice "${username}"
-echo "Configured accountsservice: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
-livetimer=$(get_timer_ms)
 configure_displaymanager
-echo "Configured displaymanager: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
-livetimer=$(get_timer_ms)
+configure_branding
-configure_calamares
-echo "Configured calamares netinstall ${netinstall} $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
-livetimer=$(get_timer_ms)
-configure_user_root /
-echo "Configured root user: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"

bin/desktop-items.in

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+# Ensure the user directories are created, some DEs (MATE)
+# create them after autostart scripts are run
+xdg-user-dirs-update --force
+
+xdg=$(xdg-user-dir DESKTOP)
+src=@datadir@/applications
+
+# if [[ -f $src/org.kde.konversation.desktop ]]; then
+#     install -m644 $src/org.kde.konversation.desktop \
+#     $xdg/org.kde.konversation.desktop
+# fi
+
+if [[ -f @bindir@/calamares ]]; then
+    cp -f $src/calamares.desktop "$xdg/"
+    sed -i s/Icon.*=calamares/Icon=artixlinux-logo/g "$xdg"/calamares.desktop
+    chmod +x "$xdg/calamares.desktop"
+fi
+
+docs=@datadir@/doc/artix
+
+for f in {Configuration,Troubleshooting}.pdf; do
+    ln -s $docs/$f "$xdg"/$f
+done
+
+if [[ -d /run/openrc ]]; then
+    ln -s $docs/OpenRC.pdf "$xdg"/OpenRC.pdf
+elif [[ -d /run/runit ]]; then
+    ln -s $docs/Runit.pdf "$xdg"/Runit.pdf
+else
+    ln -s $docs/S6.pdf "$xdg"/S6.pdf
+fi
+
+echo "live session details: /var/log/artix-live.log" > "$xdg"/README.txt

data/99_zzz-portable-efi.in

@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# grub-mkconfig helper script.
-#
-# Copyright © 2014 Niall Walsh <niallwalsh@celtux.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-set -e
-
-AT_EFI_STANDALONE=""
-AT_EFI_PORTABLE_PATH="/boot/efi/EFI/BOOT"
-
-# override tool behaviour through /etc/default/grub2-fll-standalone
-if [ -r /etc/default/grub2-portable-efi ]; then
-	. /etc/default/grub2-portable-efi
-fi
-
-patt='[[:space:]]-o[[:space:]]\+/boot/grub/grub.cfg'
-# do nothing if disabled or grub-mkconfig is generating /boot/grub/grub.cfg
-( [ "${AT_EFI_STANDALONE}" != "disable" ] && \
-	ps x | grep 'grub-mkconfig[[:space:]]' | grep -q -e "${patt}[[:space:]]" -e "${patt}$" ) || exit
-
-beeb="${AT_EFI_PORTABLE_PATH}"
-if [ -e "${beeb}" ]; then
-	# do not do anything to a beeb we didn't create
-	[ ! -e "${beeb}/fullstory" ] && exit
-else
-	# create beeb and mark it as ours
-	mkdir -p "${beeb}"
-	touch "${beeb}/fullstory"
-fi
-
-for platform in i386-efi x86_64-efi ; do
-	filename="bootx64"
-	[ "${platform}" = "i386-efi" ] && filename="bootia32"
-	[ -e /usr/lib/grub/${platform} ] && grub-mkstandalone \
-		-o ${beeb}/${filename}.efi --compress=xz  -O ${platform} \
-		/boot/grub/grub.cfg=/boot/grub/grub.cfg.new 2>&1 > /dev/null
-done
-

data/desktop.map

@@ -4,15 +4,15 @@ jwm:jwm
 i3:i3
 fluxbox:startfluxbox
 pekwm:pekwm
-plasma:startkde
-gnome:gnome-session
-xfce:startxfce4
-cinnamon:cinnamon-session-cinnamon
-mate:mate-session
 enlightenment:enlightenment_start
+Lumina-DE:start-lumina-desktop
 LXDE:lxsession
+plasma:startplasma-x11
 lxqt:lxqt-session
 pantheon:pantheon-session
 budgie-desktop:budgie-desktop
 deepin:startdde
-Lumina-DE:start-lumina-desktop
+mate:mate-session
+cinnamon:cinnamon-session-cinnamon
+xfce:startxfce4
+gnome:gnome-session

data/grub2-portable-efi

@@ -1,15 +0,0 @@
-# Defaults for grub2-portable-efi update-grub helper
-# sourced by grub2's update-grub
-# installed at /etc/default/grub2-portable-efi by the maintainer scripts
-
-#
-# This is a POSIX shell fragment
-#
-
-# specify is this should be disabled (set to "disable")
-# default:
-#AT_EFI_STANDALONE=""
-
-# specify where to install the portable efi
-# default: /boot/efi/EFI/BOOT
-#AT_EFI_PORTABLE_PATH="/boot/efi/EFI/BOOT"

data/live.conf

@@ -1,20 +1,7 @@
 # live session configuration
 
 # autologin
-autologin=true
+AUTOLOGIN=true
-
-# live username
-username=artix
 
 # live password
-password=artix
+PASSWORD=artix
-
-# live group membership
-addgroups='video,power,disk,storage,optical,network,lp,scanner,wheel'
-
-# default_desktop_file
-default_desktop_file=lxqt
-
-# default_desktop_executable
-default_desktop_executable=lxqt-session
-

data/rc/gnupg-mount.in

@@ -1,5 +1,5 @@
 #!/usr/bin/openrc-run
-# Copyright 2015 artoo (artoo@cromnix.org)
+# Copyright 2019 artoo (artoo@artixlinux.org)
 # Distributed under the terms of the GNU General Public License v2
 
 target_dir=/etc/pacman.d/gnupg

data/runit/live.in

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+. @libdir@/rc/functions
+
+case "$1" in
+    start)
+        stat_busy "Initializing artix live system"
+        artix-live #|| stat_die
+        add_daemon live
+        stat_done
+        ;;
+    *)
+        echo "usage: $0 {start}"
+        ;;
+esac

data/runit/pacman-init.run

@@ -0,0 +1,5 @@
+#!/bin/sh
+mount -t tmpfs -o size=10M,mode=0755 tmpfs /etc/pacman.d/gnupg
+pacman-key --init 1>&2
+pacman-key --populate archlinux artix 1>&2
+exec chpst -b pacman-init pause

data/s6/artix-live/type.in

@@ -0,0 +1 @@
+oneshot

data/s6/artix-live/up.in

@@ -0,0 +1,2 @@
+#!@bindir@/execlineb -P
+exec @bindir@/artix-live

data/s6/live/contents

@@ -0,0 +1,2 @@
+artix-live
+pacman-init

data/s6/live/type

@@ -0,0 +1 @@
+bundle

data/s6/pacman-init/down.in

@@ -0,0 +1,2 @@
+#!@bindir@/execlineb -P
+umount -l /etc/pacman.d/gnupg

data/s6/pacman-init/type.in

@@ -0,0 +1 @@
+oneshot

data/s6/pacman-init/up.in

@@ -0,0 +1,6 @@
+#!@bindir@/execlineb -P
+foreground { mkdir -p /etc/pacman.d/gnupg }
+foreground { mount -t tmpfs -o size=10M,mode=0755 tmpfs /etc/pacman.d/gnupg }
+fdmove -c 2 1
+foreground { pacman-key --init }
+foreground { pacman-key --populate archlinux artix }

data/sysusers.in

@@ -0,0 +1,12 @@
+# artix live user
+u @live@ 1000 - /home/@live@ /bin/bash
+
+m @live@ video
+m @live@ power
+m @live@ cdrom
+m @live@ network
+m @live@ lp
+m @live@ scanner
+m @live@ wheel
+m @live@ log
+m @live@ users

lib/util-live.sh

@@ -1,19 +1,15 @@
-#!/bin/bash
+#!/hint/bash
-#
+
-# This program is free software; you can redistribute it and/or modify
+export LC_MESSAGES=C
-# it under the terms of the GNU General Public License as published by
+export LANG=C
-# the Free Software Foundation; version 2 of the License.
+
-#
+# {{{ functions
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
 
 kernel_cmdline(){
     for param in $(cat /proc/cmdline); do
         case "${param}" in
             $1=*) echo "${param##*=}"; return 0 ;;
-            $1) return 0 ;;
+            "$1") return 0 ;;
             *) continue ;;
         esac
     done
@@ -22,185 +18,131 @@ kernel_cmdline(){
 }
 
 get_lang(){
-    echo $(kernel_cmdline lang)
+    kernel_cmdline lang
 }
 
 get_keytable(){
-    echo $(kernel_cmdline keytable)
+    kernel_cmdline keytable
 }
 
 get_tz(){
-    echo $(kernel_cmdline tz)
+    kernel_cmdline tz
-}
-
-get_cal_mode(){
-    echo $(kernel_cmdline netinstall)
-}
-
-get_timer_ms(){
-    echo $(date +%s%3N)
-}
-
-# $1: start timer
-elapsed_time_ms(){
-    echo $(echo $1 $(get_timer_ms) | awk '{ printf "%0.3f",($2-$1)/1000 }')
-}
-
-load_live_config(){
-
-    [[ -f $1 ]] || return 1
-
-    live_conf="$1"
-
-    [[ -r ${live_conf} ]] && source ${live_conf}
-
-    [[ -z ${autologin} ]] && autologin=true
-
-    [[ -z ${username} ]] && username="artix"
-
-    [[ -z ${password} ]] && password="artix"
-
-    [[ -z ${addgroups} ]] && addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,audio"
-
-    echo "Loaded ${live_conf}: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
-    return 0
 }
 
 is_valid_de(){
-    if [[ ${default_desktop_executable} != "none" ]] && \
+    if [[ ${DEFAULT_DESKTOP_EXECUTABLE} != "none" ]] && \
-    [[ ${default_desktop_file} != "none" ]]; then
+    [[ ${DEFAULT_DESKTOP_FILE} != "none" ]]; then
         return 0
-    else
-        return 1
     fi
-}
+    return 1
-
-load_desktop_map(){
-    local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g" \
-        file=${DATADIR}/desktop.map
-    local desktop_map=$(sed "$_com_rm" "$file" | sed "$_space" | sed "$_clean")
-    echo ${desktop_map}
 }
 
 detect_desktop_env(){
-    local xs=/usr/share/xsessions ex=/usr/bin key val map=( $(load_desktop_map) )
+    local key val map
-    default_desktop_file="none"
+    map="${DATADIR}"/artools/desktop.map
-    default_desktop_executable="none"
+    DEFAULT_DESKTOP_FILE="none"
-    for item in "${map[@]}";do
+    DEFAULT_DESKTOP_EXECUTABLE="none"
+    while read -r item; do
         key=${item%:*}
         val=${item#*:}
-        if [[ -f $xs/$key.desktop ]] && [[ -f $ex/$val ]];then
+        if [[ -f "${DATADIR}"/xsessions/$key.desktop ]] && [[ -f ${BINDIR}/$val ]];then
-            default_desktop_file="$key"
+            DEFAULT_DESKTOP_FILE="$key"
-            default_desktop_executable="$val"
+            DEFAULT_DESKTOP_EXECUTABLE="$val"
         fi
-    done
+    done < "$map"
+    echo "Detected ${DEFAULT_DESKTOP_EXECUTABLE} ${DEFAULT_DESKTOP_FILE}" >> "${LOGFILE}"
 }
 
 configure_accountsservice(){
-    local path=/var/lib/AccountsService/users
+    local path=/var/lib/AccountsService/users user="${1:-${LIVEUSER}}"
     if [ -d "${path}" ] ; then
-        echo "[User]" > ${path}/$1
+        echo "[User]" > ${path}/"$user"
-        echo "XSession=${default_desktop_file}" >> ${path}/$1
+        echo "XSession=${DEFAULT_DESKTOP_FILE}" >> ${path}/"$user"
-        if [[ -f "/var/lib/AccountsService/icons/$1.png" ]];then
+        if [[ -f "/var/lib/AccountsService/icons/$user.png" ]];then
-            echo "Icon=/var/lib/AccountsService/icons/$1.png" >> ${path}/$1
+            echo "Icon=/var/lib/AccountsService/icons/$user.png" >> ${path}/"$user"
         fi
     fi
+    echo "Configured accountsservice" >> "${LOGFILE}"
 }
 
  set_lightdm_greeter(){
-    local greeters=$(ls /usr/share/xgreeters/*greeter.desktop) name
+    local name
-    for g in ${greeters[@]};do
+    for g in "${DATADIR}"/xgreeters/*.desktop;do
         name=${g##*/}
         name=${name%%.*}
         case ${name} in
             lightdm-gtk-greeter) break ;;
             lightdm-*-greeter)
-                sed -i -e "s/^.*greeter-session=.*/greeter-session=${name}/" /etc/lightdm/lightdm.conf
+                sed -e "s/^.*greeter-session=.*/greeter-session=${name}/" \
+                    -i /etc/lightdm/lightdm.conf
             ;;
         esac
     done
  }
 
- set_lightdm_vt(){
-	sed -i -e 's/^.*minimum-vt=.*/minimum-vt=7/' /etc/lightdm/lightdm.conf
- }
-
 configure_displaymanager(){
     # Try to detect desktop environment
     # Configure display manager
-    if [[ -f /usr/bin/lightdm ]];then
+
+    if [[ -f "${BINDIR}"/lightdm ]];then
         groupadd -r autologin
-        set_lightdm_vt
+        gpasswd -a "${LIVEUSER}" autologin &> /dev/null
         set_lightdm_greeter
-        if $(is_valid_de); then
+        if is_valid_de; then
-                sed -i -e "s/^.*user-session=.*/user-session=$default_desktop_file/" /etc/lightdm/lightdm.conf
+            sed -e "s/^.*user-session=.*/user-session=$DEFAULT_DESKTOP_FILE/" \
+                -e 's/^.*minimum-vt=.*/minimum-vt=7/' \
+                -i /etc/lightdm/lightdm.conf
         fi
-        if ${autologin};then
+        ${AUTOLOGIN} && sed -e "s/^.*autologin-user=.*/autologin-user=${LIVEUSER}/" \
-            gpasswd -a ${username} autologin &> /dev/null
+                -e "s/^.*autologin-user-timeout=.*/autologin-user-timeout=0/" \
-            sed -i -e "s/^.*autologin-user=.*/autologin-user=${username}/" /etc/lightdm/lightdm.conf
+                -e "s/^.*pam-autologin-service=.*/pam-autologin-service=lightdm-autologin/" \
-            sed -i -e "s/^.*autologin-user-timeout=.*/autologin-user-timeout=0/" /etc/lightdm/lightdm.conf
+                -i /etc/lightdm/lightdm.conf
-            sed -i -e "s/^.*pam-autologin-service=.*/pam-autologin-service=lightdm-autologin/" /etc/lightdm/lightdm.conf
+    elif [[ -f "${BINDIR}"/gdm ]];then
-        fi
-    elif [[ -f /usr/bin/gdm ]];then
         configure_accountsservice "gdm"
-        if ${autologin};then
+        ${AUTOLOGIN} && sed -e "s/\[daemon\]/\[daemon\]\nAutomaticLogin=${LIVEUSER}\nAutomaticLoginEnable=True/" \
-            sed -i -e "s/\[daemon\]/\[daemon\]\nAutomaticLogin=${username}\nAutomaticLoginEnable=True/" /etc/gdm/custom.conf
+                -i /etc/gdm/custom.conf
+    elif [[ -f "${BINDIR}"/sddm ]];then
+        if is_valid_de; then
+            sed -e "s|^Session=.*|Session=$DEFAULT_DESKTOP_FILE.desktop|" \
+                -i /etc/sddm.conf
         fi
-    elif [[ -f /usr/bin/sddm ]];then
+        ${AUTOLOGIN} && sed -e "s|^User=.*|User=${LIVEUSER}|" \
-        if $(is_valid_de); then
+                -i /etc/sddm.conf
-            sed -i -e "s|^Session=.*|Session=$default_desktop_file.desktop|" /etc/sddm.conf
+    elif [[ -f "${BINDIR}"/lxdm ]];then
+        if is_valid_de; then
+            sed -e "s|^.*session=.*|session=${BINDIR}/${DEFAULT_DESKTOP_EXECUTABLE}|" \
+                -i /etc/lxdm/lxdm.conf
         fi
-        if ${autologin};then
+        ${AUTOLOGIN} && sed -e "s/^.*autologin=.*/autologin=${LIVEUSER}/" \
-            sed -i -e "s|^User=.*|User=${username}|" /etc/sddm.conf
+                -i /etc/lxdm/lxdm.conf
-        fi
-    elif [[ -f /usr/bin/lxdm ]];then
-        if $(is_valid_de); then
-            sed -i -e "s|^.*session=.*|session=/usr/bin/$default_desktop_executable|" /etc/lxdm/lxdm.conf
-        fi
-        if ${autologin};then
-            sed -i -e "s/^.*autologin=.*/autologin=${username}/" /etc/lxdm/lxdm.conf
-        fi
-    fi
-}
-
-gen_pw(){
-    echo $(perl -e 'print crypt($ARGV[0], "password")' ${password})
-}
-
-configure_user(){
-    # set up user and password
-    if [[ -n ${password} ]];then
-            useradd -m -G ${addgroups} -p $(gen_pw) -s /bin/bash ${username}
-    else
-            useradd -m -G ${addgroups} -s /bin/bash ${username}
     fi
+    echo "Configured displaymanager" >> "${LOGFILE}"
 }
 
 find_legacy_keymap(){
-    local file="${DATADIR}/kbd-model.map"
+    local file="${DATADIR}/artools/kbd-model.map" kt="$1"
     while read -r line || [[ -n $line ]]; do
         if [[ -z $line ]] || [[ $line == \#* ]]; then
             continue
         fi
 
-        mapping=( $line ); # parses columns
+        local mapping=( "$line" ); # parses columns
         if [[ ${#mapping[@]} != 5 ]]; then
             continue
         fi
 
-        if  [[ "${keytable}" != "${mapping[0]}" ]]; then
+        if  [[ "$kt" != "${mapping[0]}" ]]; then
             continue
         fi
 
-        if [[ "${mapping[3]}" = "-" ]]; then
+        if [[ "${mapping[3]}" == "-" ]]; then
             mapping[3]=""
         fi
 
         X11_LAYOUT=${mapping[1]}
         X11_MODEL=${mapping[2]}
         X11_VARIANT=${mapping[3]}
-        x11_OPTIONS=${mapping[4]}
+        X11_OPTIONS=${mapping[4]}
     done < $file
 }
 
@@ -212,12 +154,13 @@ write_x11_config(){
     local X11_MODEL="pc105"
     local X11_VARIANT=""
     local X11_OPTIONS="terminate:ctrl_alt_bksp"
+    local kt="$1"
 
-    find_legacy_keymap
+    find_legacy_keymap "$kt"
 
     # layout not found, use KBLAYOUT
     if [[ -z "$X11_LAYOUT" ]]; then
-        X11_LAYOUT="${keytable}"
+        X11_LAYOUT="$kt"
     fi
 
     # create X11 keyboard layout config
@@ -225,74 +168,92 @@ write_x11_config(){
 
     local XORGKBLAYOUT="/etc/X11/xorg.conf.d/00-keyboard.conf"
 
-    echo "" >> "$XORGKBLAYOUT"
     echo "Section \"InputClass\"" > "$XORGKBLAYOUT"
-    echo " Identifier \"system-keyboard\"" >> "$XORGKBLAYOUT"
+    {
-    echo " MatchIsKeyboard \"on\"" >> "$XORGKBLAYOUT"
+    echo " Identifier \"system-keyboard\""
-    echo " Option \"XkbLayout\" \"$X11_LAYOUT\"" >> "$XORGKBLAYOUT"
+    echo " MatchIsKeyboard \"on\""
-    echo " Option \"XkbModel\" \"$X11_MODEL\"" >> "$XORGKBLAYOUT"
+    echo " Option \"XkbLayout\" \"$X11_LAYOUT\""
-    echo " Option \"XkbVariant\" \"$X11_VARIANT\"" >> "$XORGKBLAYOUT"
+    echo " Option \"XkbModel\" \"$X11_MODEL\""
-    echo " Option \"XkbOptions\" \"$X11_OPTIONS\"" >> "$XORGKBLAYOUT"
+    echo " Option \"XkbVariant\" \"$X11_VARIANT\""
-    echo "EndSection" >> "$XORGKBLAYOUT"
+    echo " Option \"XkbOptions\" \"$X11_OPTIONS\""
+    echo "EndSection"
+    } >> "$XORGKBLAYOUT"
 }
 
 configure_language(){
     # hack to be able to set the locale on bootup
-    local lang=$(get_lang)
+    local lang keytable timezone
+    lang=$(get_lang)
     keytable=$(get_keytable)
-    local timezone=$(get_tz)
+    timezone=$(get_tz)
-    # Fallback
-#     [[ -z "${lang}" ]] && lang="en_US"
-#     [[ -z "${keytable}" ]] && keytable="us"
-#     [[ -z "${timezone}" ]] && timezone="Etc/UTC"
 
     sed -e "s/#${lang}.UTF-8/${lang}.UTF-8/" -i /etc/locale.gen
 
-    # 	echo "LANG=${lang}.UTF-8" >> /etc/environment
-
-    if [[ -d /run/openrc ]]; then
-        sed -i "s/keymap=.*/keymap=\"${keytable}\"/" /etc/conf.d/keymaps
-    fi
     echo "KEYMAP=${keytable}" > /etc/vconsole.conf
     echo "LANG=${lang}.UTF-8" > /etc/locale.conf
-    ln -sf /usr/share/zoneinfo/${timezone} /etc/localtime
+    ln -sf "${DATADIR}"/zoneinfo/"${timezone}" /etc/localtime
 
-    write_x11_config
+    write_x11_config "${keytable}"
 
     loadkeys "${keytable}"
 
-    locale-gen ${lang}
+    locale-gen "${lang}"
-    echo "Configured language: ${lang}" >> "${LOGFILE}"
+    {
-    echo "Configured keymap: ${keytable}" >> "${LOGFILE}"
+    echo "Configured language: ${lang}"
-    echo "Configured timezone: ${timezone}" >> "${LOGFILE}"
+    echo "Configured keymap: ${keytable}"
-}
+    echo "Configured timezone: ${timezone}"
-
+    echo "Finished localization"
-configure_calamares(){
+    } >> "${LOGFILE}"
-    if [[ -f /usr/bin/calamares ]];then
-        netinstall=$(get_cal_mode)
-        if [[ "${netinstall}" == 'no' ]];then
-            sed -e "/- netinstall/d" \
-                -e "s|- chrootcfg|- unpackfs|" -i /etc/calamares/settings.conf
-
-            sed -e '$ d' -i /etc/calamares/modules/welcome.conf
-        fi
-    fi
-}
-
-configure_sudoers_d(){
-    echo "%wheel  ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/g_wheel
-    echo "root ALL=(ALL) ALL"  > /etc/sudoers.d/u_root
 }
 
 configure_swap(){
-    local swapdev="$(fdisk -l 2>/dev/null | grep swap | cut -d' ' -f1)"
+    local swapdev
+    swapdev="$(fdisk -l 2>/dev/null | grep swap | cut -d' ' -f1)"
     if [ -e "${swapdev}" ]; then
-        swapon ${swapdev}
+        swapon "${swapdev}"
+    fi
+    echo "Activated swap and added to fstab" >> "${LOGFILE}"
+}
+
+configure_branding(){
+    if [[ -f "${BINDIR}"/neofetch ]]; then
+        neofetch >| /etc/issue
+        echo "Configured branding" >> "${LOGFILE}"
     fi
 }
 
-configure_user_root(){
+configure_user(){
-    # set up root password
+    echo "root:${PASSWORD}" | chroot / chpasswd
-    echo "root:${password}" | chroot $1 chpasswd
     cp /etc/skel/.{bash_profile,bashrc,bash_logout} /root/
+
+    mkdir /home/${LIVEUSER}
+    chown ${LIVEUSER}:${LIVEUSER} /home/${LIVEUSER}
+    echo "${LIVEUSER}:${PASSWORD}" | chroot / chpasswd
+    cp -r /etc/skel/.[^.]* /home/${LIVEUSER}
+    chown -R ${LIVEUSER}:${LIVEUSER} /home/${LIVEUSER}
+    echo "Configured live user ${LIVEUSER} with password ${PASSWORD}" >> "${LOGFILE}"
 }
+
+# }}}
+
+
+load_live_config(){
+
+    [[ -f $1 ]] || return 1
+
+    local live_conf="$1"
+
+    [[ -r "${live_conf}" ]] && source "${live_conf}"
+
+    AUTOLOGIN=${AUTOLOGIN:-true}
+
+    PASSWORD=${PASSWORD:-artix}
+
+    return 0
+}
+
+load_live_config "@sysconfdir@/artools/live.conf" || load_live_config "@datadir@/artools/live.conf"
+
+LIVEUSER=@live@
+DATADIR=@datadir@
+BINDIR=@bindir@