Add 66 to Makefile

Reviewed-on: artix/live-services#7

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,29 +1,23 @@
-VERSION = 0.5
+VERSION = 0.10
 
 PKG = live-services
 TOOLS = artools
 
 SYSCONFDIR = /etc
-ifdef PREFIX
+PREFIX ?= /usr
-PREFIX = /usr/local
-endif
 BINDIR = $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib
 DATADIR = $(PREFIX)/share
+SYSUSERSDIR = $(PREFIX)/lib/sysusers.d
+LIVEUSER ?= artix
 
 FMODE = -m0644
 DMODE = -dm0755
 BMODE = -m0755
-RM = rm -f
-M4 = m4 -P
-CHAW = chmod a-w
-CHX = chmod +x
 
 BIN = \
 	bin/artix-live
 
-LIBS = $(wildcard lib/*.sh)
-
 SHARED = \
 	$(wildcard data/*.map) \
 	data/live.conf
@@ -39,38 +33,62 @@ RUNIT_SVD = \
 RUNIT_SV = \
 	data/runit/pacman-init.run
 
-GRUB_DEFAULT = \
+S6_LIVE = \
-	data/grub2-portable-efi
+	data/s6/artix-live/up \
+	data/s6/artix-live/type
 
-GRUB_D = \
+S6_PI = \
-	data/99_zzz-portable-efi
+	data/s6/pacman-init/type \
+	data/s6/pacman-init/up \
+	data/s6/pacman-init/down
+
+S6_BUNDLE = \
+	data/s6/live/type \
+	data/s6/live/contents
+
+66_LIVE = \
+	data/66/artix-live
+
+66_PI = \
+	data/66/pacman-init
 
 XDG = $(wildcard data/*.desktop)
 
 XBIN = bin/desktop-items
 
-all: $(BIN) $(RC) $(RUNIT_SV) $(XBIN) $(GRUB_D)
+SYSUSERS = \
+	data/sysusers
 
-EDIT = sed -e "s|@datadir[@]|$(DATADIR)/$(TOOLS)|g" \
+RM = rm -f
-	-e "s|@sysconfdir[@]|$(SYSCONFDIR)/$(TOOLS)|g" \
+M4 = m4 -P
-	-e "s|@libdir[@]|$(LIBDIR)/$(TOOLS)|g"
+CHMODAW = chmod a-w
+CHMODX = chmod +x
 
-%: %.in Makefile
+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) $@.in | $(EDIT) >$@
+	@{ echo -n 'm4_changequote([[[,]]])'; cat $@.in; } | $(M4) | $(EDIT) >$@
-	@$(CHAW) "$@"
+	@$(CHMODAW) "$@"
-	@$(CHX) "$@"
+	@$(CHMODX) "$@"
+	@bash -O extglob -n "$@"
 
 clean:
-	$(RM) $(BIN) $(RC) $(GRUB_D)
+	$(RM) $(BIN) $(SYSUSERS) $(XBIN) $(RC) $(RUNIT_SVD) $(S6_PI) $(S6_LIVE)
 
 install_base:
 	install $(DMODE) $(DESTDIR)$(BINDIR)
 	install $(BMODE) $(BIN) $(DESTDIR)$(BINDIR)
 
-	install $(DMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(DMODE) $(DESTDIR)$(SYSUSERSDIR)
-	install $(FMODE) $(LIBS) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(FMODE) $(SYSUSERS) $(DESTDIR)$(SYSUSERSDIR)/live-artix.conf
 
 	install $(DMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
 	install $(FMODE) $(SHARED) $(DESTDIR)$(DATADIR)/$(TOOLS)
@@ -83,18 +101,29 @@ install_runit:
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/rc/sysinit
 	install $(DMODE) $(DESTDIR)$(LIBDIR)/rc/sv.d
 
-	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init
 	install $(BMODE) $(RUNIT_SVD) $(DESTDIR)$(LIBDIR)/rc/sv.d
 	ln -sf $(LIBDIR)/rc/sv.d/live $(DESTDIR)$(SYSCONFDIR)/rc/sysinit/98-live
 
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init
 	install $(BMODE) $(RUNIT_SV) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init/run
 
-install_portable_efi:
+install_s6:
-	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/default
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv
-	install $(BMODE) $(GRUB_DEFAULT) $(DESTDIR)$(SYSCONFDIR)/default
 
-	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/grub.d
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/pacman-init
-	install $(BMODE) $(GRUB_D) $(DESTDIR)$(SYSCONFDIR)/grub.d
+	install $(BMODE) $(S6_PI) $(DESTDIR)$(SYSCONFDIR)/s6/sv/pacman-init/
+
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live
+	install $(BMODE) $(S6_LIVE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live/
+
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/live
+	install $(BMODE) $(S6_BUNDLE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/live/
+
+install_66:
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/66/service
+
+	install $(FMODE) $(66_LIVE) $(DESTDIR)$(SYSCONFDIR)/66/service/artix-live
+	install $(FMODE) $(66_PI) $(DESTDIR)$(SYSCONFDIR)/66/service/pacman-init
 
 install_xdg:
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
@@ -103,6 +132,6 @@ install_xdg:
 	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/skel/.config/autostart
 	install -m0755 ${XDG} $(DESTDIR)$(SYSCONFDIR)/skel/.config/autostart
 
-install: install_base install_rc install_portable_efi install_xdg
+install: install_base install_rc install_runit install_s6 install_xdg
 
-.PHONY: all clean install uninstall dist
+.PHONY: install

bin/artix-live.in

@@ -1,50 +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_accountsservice "${username}"
+
-echo "Configured accountsservice: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
+configure_accountsservice
 
-livetimer=$(get_timer_ms)
 configure_displaymanager
-echo "Configured displaymanager: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
-livetimer=$(get_timer_ms)
+configure_branding
-configure_user_root /
-echo "Configured root user: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"

bin/desktop-items.in

@@ -1,26 +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=/usr/share/applications
+src=@datadir@/applications
 
-if [[ -f $src/org.kde.konversation.desktop ]]; then
+# if [[ -f $src/org.kde.konversation.desktop ]]; then
-    install -Dm755 $src/org.kde.konversation.desktop \
+#     install -m644 $src/org.kde.konversation.desktop \
-    $xdg/konversation-artix-help.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
 
-if [[ -f /usr/bin/calamares ]]; then
+docs=@datadir@/doc/artix
-    install -Dm755 $src/calamares.desktop \
-    $xdg/calamares.desktop
-fi
 
-docs=/usr/share/doc/artix
+for f in {Configuration,Troubleshooting}.pdf; do
-
+    ln -s $docs/$f "$xdg"/$f
-for f in {Configuration,Installation,Migration,Troubleshooting}.pdf;do
-    ln -s $docs/$f $xdg/$f
 done
 
-if [[ -d /run/openrc ]];then
+if [[ -d /run/openrc ]]; then
-    ln -s $docs/OpenRC.pdf $xdg/OpenRC.pdf
+    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/Runit.pdf $xdg/Runit.pdf
+    ln -s $docs/S6.pdf "$xdg"/S6.pdf
 fi
+
+echo "live session details: /var/log/artix-live.log" > "$xdg"/README.txt

data/66/artix-live

@@ -0,0 +1,8 @@
+[main]
+@type = oneshot
+@version = 0.0.1
+@description = "artix-live service"
+@user = ( root )
+
+[start]
+@execute = (artix-live)

data/66/pacman-init

@@ -0,0 +1,13 @@
+[main]
+@type = oneshot
+@description = "pacman init service"
+@version = 0.0.1
+@user = (root)
+
+[start]
+@execute = (
+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/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

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /usr/lib/rc/functions
+. @libdir@/rc/functions
 
 case "$1" in
     start)

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
-        fi
+        if is_valid_de; then
-        if ${autologin};then
+            sed -e "s|^.*session=.*|session=${BINDIR}/${DEFAULT_DESKTOP_EXECUTABLE}|" \
-            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
+        ${AUTOLOGIN} && sed -e "s/^.*autologin=.*/autologin=${LIVEUSER}/" \
+                -i /etc/lxdm/lxdm.conf
     fi
-}
+    echo "Configured displaymanager" >> "${LOGFILE}"
-
-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
 }
 
 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,57 +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"
+    } >> "${LOGFILE}"
 }
 
 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@