makefile: small fix

Makefile

@@ -1,7 +1,23 @@
-Version=0.1
+VERSION = 0.5
+
+PKG = live-services
+TOOLS = artools
 
-PREFIX = /usr/local
 SYSCONFDIR = /etc
+ifdef PREFIX
+PREFIX = /usr/local
+endif
+BINDIR = $(PREFIX)/bin
+LIBDIR = $(PREFIX)/lib
+DATADIR = $(PREFIX)/share
+
+FMODE = -m0644
+DMODE = -dm0755
+BMODE = -m0755
+RM = rm -f
+M4 = m4 -P
+CHAW = chmod a-w
+CHX = chmod +x
 
 BIN = \
 	bin/artix-live
@@ -17,67 +33,82 @@ RC = \
 	data/rc/pacman-init \
 	data/rc/artix-live
 
+RUNIT_CORE = \
+	data/runit/89-artix-live.sh
+
+RUNIT_SV = \
+	data/runit/pacman-init.run
+
 GRUB_DEFAULT = \
 	data/grub2-portable-efi
 
 GRUB_D = \
 	data/99_zzz-portable-efi
 
-all: $(BIN) $(RC) $(XBIN) ${GRUB_D}
+all: $(BIN) $(RC) $(RUNIT_SV) $(XBIN) $(GRUB_D)
 
-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"
+EDIT = sed -e "s|@datadir[@]|$(DATADIR)/$(TOOLS)|g" \
+	-e "s|@sysconfdir[@]|$(SYSCONFDIR)/$(TOOLS)|g" \
+	-e "s|@libdir[@]|$(LIBDIR)/$(TOOLS)|g"
 
 %: %.in Makefile
 	@echo "GEN $@"
 	@$(RM) "$@"
-	@m4 -P $@.in | $(edit) >$@
-	@chmod a-w "$@"
-	@chmod +x "$@"
+	@$(M4) $@.in | $(EDIT) >$@
+	@$(CHAW) "$@"
+	@$(CHX) "$@"
 
 clean:
-	rm -f $(BIN) $(RC) ${GRUB_D}
+	$(RM) $(BIN) $(RC) $(GRUB_D)
 
 install_base:
-	install -dm0755 $(DESTDIR)$(PREFIX)/bin
-	install -m0755 ${BIN} $(DESTDIR)$(PREFIX)/bin
+	install $(DMODE) $(DESTDIR)$(BINDIR)
+	install $(BMODE) $(BIN) $(DESTDIR)$(BINDIR)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
-	install -m0644 ${LIBS} $(DESTDIR)$(PREFIX)/lib/artools
+	install $(DMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
+	install $(FMODE) $(LIBS) $(DESTDIR)$(LIBDIR)/$(TOOLS)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
-	install -m0644 ${SHARED} $(DESTDIR)$(PREFIX)/share/artools
+	install $(DMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
+	install $(FMODE) $(SHARED) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
 install_rc:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/init.d
-	install -m0755 ${RC} $(DESTDIR)$(SYSCONFDIR)/init.d
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/init.d
+	install $(BMODE) $(RC) $(DESTDIR)$(SYSCONFDIR)/init.d
+
+install_runit:
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/runit/core-services
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init
+	install $(BMODE) $(RUNIT_CORE) $(DESTDIR)$(SYSCONFDIR)/runit/core-services
+	install $(BMODE) $(RUNIT_SV) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init/run
 
 install_portable_efi:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/default
-	install -m0755 $(GRUB_DEFAULT) $(DESTDIR)$(SYSCONFDIR)/default
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/default
+	install $(BMODE) $(GRUB_DEFAULT) $(DESTDIR)$(SYSCONFDIR)/default
 
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/grub.d
-	install -m0755 $(GRUB_D) $(DESTDIR)$(SYSCONFDIR)/grub.d
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/grub.d
+	install $(BMODE) $(GRUB_D) $(DESTDIR)$(SYSCONFDIR)/grub.d
 
 uninstall_base:
-	for f in ${BIN}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
-	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
+	for f in $(notdir $(BIN)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
+	for f in $(notdir $(SHARED)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/$$f; done
+	for f in $(notdir $(LIBS)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
 
 uninstall_portable_efi:
-	for f in ${GRUB_DEFAULT}; do rm -f $(DESTDIR)$(SYSCONFDIR)/default/$$f; done
-	for f in ${GRUB_D}; do rm -f $(DESTDIR)$(SYSCONFDIR)/grub.d/$$f; done
+	for f in $(notdir $(GRUB_DEFAULT)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/default/$$f; done
+	for f in $(notdir $(GRUB_D)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/grub.d/$$f; done
 
 uninstall_rc:
-	for f in ${RC}; do rm -f $(DESTDIR)$(SYSCONFDIR)/init.d/$$f; done
+	for f in $(notdir $(RC)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/init.d/$$f; done
+
+uninstall_runit:
+	for f in $(notdir $(RUNIT_SV)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/runit/sv/$$f; done
 
 install: install_base install_rc install_portable_efi
 
-uninstall: uninstall_base uninstall_rc uninstall_portable_efi
+uninstall: uninstall_base uninstall_rc uninstall_runit uninstall_portable_efi
 
 dist:
-	git archive --format=tar --prefix=live-services-$(Version)/ $(Version) | gzip -9 > live-services-$(Version).tar.gz
-	gpg --detach-sign --use-agent live-services-$(Version).tar.gz
+	git archive --format=tar --prefix=$(PKG)-$(VERSION)/ $(VERSION) | gzip -9 > $(PKG)-$(VERSION).tar.gz
+	gpg --detach-sign --use-agent $(PKG)-$(VERSION).tar.gz
 
 .PHONY: all clean install uninstall dist

bin/artix-live.in

@@ -3,7 +3,7 @@
 LIBDIR='@libdir@'
 DATADIR='@datadir@'
 SYSCONFDIR='@sysconfdir@'
-LOGFILE='/var/log/cromnix-live.log'
+LOGFILE='/var/log/artix-live.log'
 
 export LC_MESSAGES=C
 export LANG=C
@@ -41,9 +41,9 @@ livetimer=$(get_timer_ms)
 configure_sudoers_d
 echo "Configured sudoers: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
-livetimer=$(get_timer_ms)
-configure_machine_id
-echo "Configured machine-id: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
+# livetimer=$(get_timer_ms)
+# configure_machine_id
+# echo "Configured machine-id: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
 livetimer=$(get_timer_ms)
 configure_accountsservice "${username}"
@@ -53,6 +53,10 @@ livetimer=$(get_timer_ms)
 configure_displaymanager
 echo "Configured displaymanager: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
+livetimer=$(get_timer_ms)
+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}"

data/live.conf

@@ -3,21 +3,15 @@
 # autologin
 autologin=true
 
-# login shell
-login_shell=/bin/bash
-
 # live username
-username=cromnix
+username=artix
 
 # live password
-password=cromnix
+password=artix
 
 # live group membership
 addgroups='video,power,disk,storage,optical,network,lp,scanner,wheel'
 
-# iso name
-iso_name=cromnix
-
 # default_desktop_file
 default_desktop_file=lxqt
 

data/rc/pacman-init.in

@@ -12,6 +12,6 @@ depend() {
 start() {
 	ebegin "Running pacman initialization"
 	/usr/bin/pacman-key --init &> /dev/null
-	/usr/bin/pacman-key --populate archlinux cromnix &> /dev/null
+	/usr/bin/pacman-key --populate archlinux artix &> /dev/null
 	eend $?
 }

data/runit/89-artix-live.sh

@@ -0,0 +1,2 @@
+msg "Initializing artix-live script"
+artix-live

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

lib/util-live.sh

@@ -33,6 +33,10 @@ get_tz(){
     echo $(kernel_cmdline tz)
 }
 
+get_cal_mode(){
+    echo $(kernel_cmdline netinstall)
+}
+
 get_timer_ms(){
     echo $(date +%s%3N)
 }
@@ -52,13 +56,11 @@ load_live_config(){
 
     [[ -z ${autologin} ]] && autologin=true
 
-	[[ -z ${username} ]] && username="cromnix"
+    [[ -z ${username} ]] && username="artix"
 
-	[[ -z ${password} ]] && password="cromnix"
+    [[ -z ${password} ]] && password="artix"
 
-	[[ -z ${addgroups} ]] && addgroups=""
-
-	[[ -z ${login_shell} ]] && login_shell="/bin/bash"
+    [[ -z ${addgroups} ]] && addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,audio"
 
     echo "Loaded ${live_conf}: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
 
@@ -77,9 +79,7 @@ is_valid_de(){
 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")
+    local desktop_map=$(sed "$_com_rm" "$file" | sed "$_space" | sed "$_clean")
     echo ${desktop_map}
 }
 
@@ -147,10 +147,6 @@ configure_displaymanager(){
         if ${autologin};then
             sed -i -e "s/\[daemon\]/\[daemon\]\nAutomaticLogin=${username}\nAutomaticLoginEnable=True/" /etc/gdm/custom.conf
         fi
-	elif [[ -f /usr/bin/mdm ]];then
-		if $(is_valid_de); then
-			sed -i "s|default.desktop|$default_desktop_file.desktop|g" /etc/mdm/custom.conf
-		fi
     elif [[ -f /usr/bin/sddm ]];then
         if $(is_valid_de); then
             sed -i -e "s|^Session=.*|Session=$default_desktop_file.desktop|" /etc/sddm.conf
@@ -175,9 +171,9 @@ gen_pw(){
 configure_user(){
     # set up user and password
     if [[ -n ${password} ]];then
-		useradd -m -G ${addgroups} -p $(gen_pw) -s ${login_shell} ${username}
+            useradd -m -G ${addgroups} -p $(gen_pw) -s /bin/bash ${username}
     else
-		useradd -m -G ${addgroups} -s ${login_shell} ${username}
+            useradd -m -G ${addgroups} -s /bin/bash ${username}
     fi
 }
 
@@ -271,16 +267,16 @@ configure_language(){
     echo "Configured timezone: ${timezone}" >> "${LOGFILE}"
 }
 
-configure_machine_id(){
-	if [ -e "/etc/machine-id" ] ; then
-		# delete existing machine-id
-		echo "Deleting existing machine-id ..." >> "${LOGFILE}"
-		rm /etc/machine-id
+configure_calamares(){
+    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
-	# set unique machine-id
-	echo "Setting machine-id ..." >> "${LOGFILE}"
-	dbus-uuidgen --ensure=/etc/machine-id
-	ln -sf /etc/machine-id /var/lib/dbus/machine-id
 }
 
 configure_sudoers_d(){