Makefile: rm base profile

Add initial runit support

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

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,6 +0,0 @@
-mkinitcpio-nfs-utils
-nbd
->openrc artix-live-openrc
-squashfs-tools
-artix-live-portable-efi
-linux-lts-headers

data/base/Packages-Root

@@ -1,84 +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
-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"

lib/util-iso-profile.sh

@@ -44,14 +44,19 @@ load_profile(){
     [[ -z ${password} ]] && password="artix"
 
     if [[ -z ${addgroups} ]];then
-        addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,audio"
+        addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,audio,log"
     fi
 
     if [[ -z ${services[@]} ]];then
         services=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
     fi
 
-    [[ ${displaymanager} != "none" ]] && services+=('xdm')
+    if [[ ${displaymanager} != "none" ]];then
+        case "${initsys}" in
+            'openrc') services+=('xdm') ;;
+            'runit') services+=("${displaymanager}") ;;
+        esac
+    fi
 
     if [[ -z ${services_live[@]} ]];then
         services_live=('artix-live' 'pacman-init')

lib/util-iso-yaml.sh

@@ -27,14 +27,15 @@ write_bootloader_conf(){
 }
 
 write_servicescfg_conf(){
-    local conf="$1/servicescfg.conf"
+    local conf="$1/servicescfg.conf" init="$2"
     msg2 "Writing %s ..." "${conf##*/}"
     echo '---' >  "$conf"
+    echo "initsys: $init" >> "$conf"
     echo '' >> "$conf"
     echo 'services:' >> "$conf"
     echo '    enabled:' >> "$conf"
-    for s in ${services[@]};do
+    for svc in ${services[@]};do
-        echo "      - name: $s" >> "$conf"
+        echo "      - name: $svc" >> "$conf"
         echo '        runlevel: default' >> "$conf"
     done
 }
@@ -88,16 +89,14 @@ write_unpack_conf(){
 }
 
 configure_calamares(){
-    local dest="$1" mods="$1/etc/calamares/modules"
+    local dest="$1" mods="$1/etc/calamares/modules" init="$2"
     if [[ -d $dest/etc/calamares/modules ]];then
         info "Configuring [Calamares]"
         write_netinstall_conf "$mods"
         write_unpack_conf "$mods"
         write_users_conf "$mods"
         write_initcpio_conf "$mods"
-        case ${initsys} in
+        write_servicescfg_conf "$mods" "$init"
-            'openrc') write_servicescfg_conf "$mods" ;;
-        esac
         write_bootloader_conf "$mods"
         info "Done configuring [Calamares]"
     fi

lib/util-iso.sh

@@ -139,6 +139,14 @@ add_svc_rc(){
     fi
 }
 
+add_svc_runit(){
+    local mnt="$1" name="$2"
+    if [[ -d $mnt/etc/runit/sv/$name ]]; then
+        msg2 "Setting %s ..." "$name"
+        chroot $mnt ln -s /etc/runit/sv/$name /etc/runit/runsvdir/default &>/dev/null
+    fi
+}
+
 set_xdm(){
     if [[ -f $1/etc/conf.d/xdm ]];then
         local conf='DISPLAYMANAGER="'${displaymanager}'"'
@@ -173,6 +181,14 @@ configure_services(){
                 add_svc_rc "$mnt" "$svc" "default"
             done
         ;;
+        'runit')
+            for svc in ${services[@]}; do
+                add_svc_runit "$mnt" "$svc"
+            done
+            for svc in ${services_live[@]}; do
+                add_svc_runit "$mnt" "$svc"
+            done
+        ;;
     esac
     info "Done configuring [%s]" "${initsys}"
 }
@@ -180,7 +196,7 @@ configure_services(){
 configure_system(){
     local mnt="$1"
     case ${initsys} in
-        'openrc')
+        'openrc' | 'runit')
             configure_logind "$mnt" "elogind"
         ;;
     esac
@@ -242,7 +258,7 @@ configure_live_image(){
     configure_hosts "$fs"
     configure_system "$fs"
     configure_services "$fs"
-    configure_calamares "$fs"
+    configure_calamares "$fs" "${initsys}"
     write_live_session_conf "$fs"
     msg "Done configuring [livefs]"
 }
@@ -388,6 +404,7 @@ gen_iso_fn(){
     local vars=() name
     vars+=("${iso_name}")
     vars+=("${profile}")
+    [[ ${initsys} == 'runit' ]] && vars+=("${initsys}")
     vars+=("${iso_version}")
     vars+=("${target_arch}")
     for n in ${vars[@]};do