buildiso: write proper calameres services-66.conf

Reviewed-on: #49
Co-authored-by: artoo <artoo@artixlinux.org>
Co-committed-by: artoo <artoo@artixlinux.org>

Makefile

@@ -1,4 +1,4 @@
-VERSION=0.22
+VERSION=0.23
 
 TOOLS = artools
 PREFIX ?= /usr

bin/base/fstabgen.in

@@ -364,23 +364,19 @@ while read -r src target fstype opts fsroot; do
         pass=0
     fi
 
-    if [[ $fsroot != / ]]; then
+    if [[ $fsroot != / && $fstype != btrfs ]]; then
-        if [[ $fstype = btrfs ]]; then
+        # it's a bind mount
-            opts+=,subvol=${fsroot#/}
+        src=$(findmnt -funcevo TARGET "$src")$fsroot
-        else
+        if [[ $src -ef $target ]]; then
-            # it's a bind mount
+            # hrmm, this is weird. we're probably looking at a file or directory
-            src=$(findmnt -funcevo TARGET "$src")$fsroot
+            # that was bound into a chroot from the host machine. Ignore it,
-            if [[ $src -ef $target ]]; then
+            # because this won't actually be a valid mount. Worst case, the user
-                # hrmm, this is weird. we're probably looking at a file or directory
+            # just re-adds it.
-                # that was bound into a chroot from the host machine. Ignore it,
+            continue
-                # because this won't actually be a valid mount. Worst case, the user
-                # just re-adds it.
-                continue
-            fi
-            fstype=none
-            opts+=,bind
-            pass=0
         fi
+        fstype=none
+        opts+=,bind
+        pass=0
     fi
 
     # filesystem quirks

bin/iso/buildiso.in

@@ -86,9 +86,9 @@ make_rootfs() {
 
         basestrap "${basestrap_args[@]}" "${rootfs}" "${packages[@]}"
 
-        copy_overlay "${ROOT_OVERLAY}" "${rootfs}"
+        copy_overlay "${root_overlay}" "${rootfs}"
 
-        [[ -z ${LIVE_LIST} ]] && configure_chroot "${rootfs}"
+        [[ -z ${live_list} ]] && configure_chroot "${rootfs}"
 
         clean_up_chroot "${rootfs}"
 
@@ -109,7 +109,7 @@ make_livefs() {
 
         basestrap "${basestrap_args[@]}" "${livefs}" "${packages[@]}"
 
-        copy_overlay "${LIVE_OVERLAY}" "${livefs}"
+        copy_overlay "${live_overlay}" "${livefs}"
 
         configure_chroot "${livefs}"
 
@@ -154,7 +154,7 @@ make_grub(){
         msg "Prepare [/iso/boot/grub]"
 
         local layer=${work_dir}/rootfs
-        [[ -n ${LIVE_LIST} ]] && layer=${work_dir}/livefs
+        [[ -n ${live_list} ]] && layer=${work_dir}/livefs
 
         prepare_grub "${work_dir}/rootfs" "$layer"
 
@@ -248,10 +248,10 @@ mk_boot(){
 }
 
 mk_chroots(){
-    load_pkgs "${ROOT_LIST}" "${INITSYS}"
+    load_pkgs "${root_list}"
     run_safe "make_rootfs"
-    if [[ -n ${LIVE_LIST} ]]; then
+    if [[ -n ${live_list} ]]; then
-        load_pkgs "${LIVE_LIST}" "${INITSYS}"
+        load_pkgs "${live_list}"
         run_safe "make_livefs"
     fi
 }

bin/pkg/checkrepo.in

@@ -64,7 +64,7 @@ check_db(){
 
         for name in "${pkgname[@]}"; do
             if ! is_db_entry "$name-$artixver" "$repo"; then
-                msg_row_upgrade "${tableU}" "$repo" "$name" "$artixver" "false"
+                msg_row_red "${tableU}" "$repo" "$name" "$artixver" "false"
             else
                 ${all_db} && msg_row "${tableU}" "$repo" "$name" "$artixver" "true"
             fi

bin/pkg/comparepkg.in

@@ -34,10 +34,12 @@ write_list(){
 compare_m(){
     case ${artixrepo} in
         *testing*|*staging*|*rebuild)
-            if [[ "${a}" == "${b}" ]] || [[ "${a}" == 'staging' && "${b}" == 'rebuild' ]]; then
+            if [[ "${a}" == "${b}" ]]; then
                 msg_row "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
+            elif [[ "${a}" == 'staging' && "${b}" == 'rebuild' ]]; then
+                msg_row_yellow "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
             else
-                msg_row_notify "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
+                msg_row_green "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
                 [[ -n "$archrepo" ]] && write_list "${a}:${b}:$pkg" pkg_moves
             fi
         ;;
@@ -46,7 +48,7 @@ compare_m(){
 
 compare_u(){
     if [ "$result" -eq -1 ];then
-        msg_row_upgrade "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
+        msg_row_red "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
         write_list "${a}:$pkg" pkg_upgrades
     fi
 }
@@ -54,7 +56,7 @@ compare_u(){
 compare_d(){
     if [ "$result" -eq 1 ];then
         if [[ -n "$archver" ]] && [[ -n "$archrepo" ]];then
-            msg_row_downgrade "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
+            msg_row_yellow "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
         fi
     fi
 }

bin/pkg/deploypkg.in

@@ -92,6 +92,10 @@ passfiles=("$@")
 repo_path=${REPOS_ROOT}/${dest_repo}/os/${CARCH}
 
 if [[ -n "${passfiles[*]}" ]]; then
-    ${add_pkg} && repo_action add
+    if ${add_pkg}; then
-    ${rm_pkg} && repo_action remove
+        repo_action add
+    fi
+    if ${rm_pkg}; then
+        repo_action remove
+    fi
 fi

bin/pkg/mkchrootpkg.in

@@ -247,6 +247,15 @@ download_sources() {
         die "Could not download sources."
 }
 
+move_logfiles() {
+    local l
+    for l in "$copydir"/logdest/*; do
+        [[ $l == */logpipe.* ]] && continue
+        chown "$src_owner" "$l"
+        mv "$l" "$LOGDEST"
+    done
+}
+
 move_products() {
     local pkgfile
     for pkgfile in "$copydir"/pkgdest/*; do
@@ -259,12 +268,7 @@ move_products() {
         fi
     done
 
-    local l
+    move_logfiles
-    for l in "$copydir"/logdest/*; do
-        [[ $l == */logpipe.* ]] && continue
-        chown "$src_owner" "$l"
-        mv "$l" "$LOGDEST"
-    done
 
     for s in "$copydir"/srcpkgdest/*; do
         chown "$src_owner" "$s"
@@ -379,6 +383,7 @@ then
     move_products
 else
     (( ret += 1 ))
+    move_logfiles
 fi
 
 (( temp_chroot )) && delete_chroot "$copydir" "$copy"

data/conf/artools-iso.conf

@@ -8,7 +8,7 @@
 # the dist release; default: auto
 # ISO_VERSION=$(date +%Y%m%d)
 
-# possible values: openrc, runit, s6
+# possible values: openrc, runit, s6, 66
 # INITSYS="openrc"
 
 # gpg key; leave empty or commented to skip img signing

data/conf/artools-pkg.conf

@@ -13,6 +13,7 @@
 #         packages-openrc
 #         packages-runit
 #         packages-s6
+#         packages-66
 #         packages-python
 #         packages-perl
 #         packages-java

data/pacman/makepkg.conf

@@ -15,7 +15,7 @@ DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
           'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
           'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'rsync::/usr/bin/rsync --no-motd -z %u %o'
+          'rsync::/usr/bin/rsync --no-motd -zz %u %o'
           'scp::/usr/bin/scp -C %u %o')
 
 # Other common tools:

lib/iso/calamares.sh

@@ -31,6 +31,11 @@ write_services_s6_conf(){
     write_services_conf 'svDir' '/etc/s6/sv' 'dbDir' '/etc/s6/rc/compiled' > "$conf"
 }
 
+write_services_66_conf(){
+    local conf="$1"/services-66.conf
+    write_services_conf 'svDir' '/etc/66/service' 'runsvDir' '/var/lib/66/system' > "$conf"
+}
+
 write_postcfg(){
     local yaml
     yaml=$(write_yaml_header)
@@ -46,13 +51,10 @@ write_unpackfs() {
     local yaml
     yaml=$(write_yaml_header)
     yaml+=$(write_yaml_map 0 'unpack')
-#     if ${persist}; then
+    local fs="squashfs"
-#         yaml+=$(write_yaml_seq_map 2 'source' '"/run/artix/bootmnt/LiveOS/rootfs.img"')
+#     ${persist} && fs="ext4"
-#         yaml+=$(write_yaml_map 4 'sourcefs' '"ext4"')
-#     else
     yaml+=$(write_yaml_seq_map 2 'source' '"/run/artix/bootmnt/LiveOS/rootfs.img"')
-    yaml+=$(write_yaml_map 4 'sourcefs' '"squashfs"')
+    yaml+=$(write_yaml_map 4 'sourcefs' \'"$fs"\')
-#     fi
     yaml+=$(write_yaml_map 4 'destination' '""')
     yaml+=$(write_empty_line)
     printf '%s' "${yaml}"

lib/iso/profile.sh

@@ -11,13 +11,16 @@ show_profile(){
 
 load_profile(){
     local profile_dir="${DATADIR}/iso-profiles"
-    [[ -d ${WORKSPACE_DIR}/iso-profiles ]] && profile_dir=${WORKSPACE_DIR}/iso-profiles
+    [[ -d "${WORKSPACE_DIR}"/iso-profiles ]] && profile_dir="${WORKSPACE_DIR}"/iso-profiles
 
-    ROOT_LIST="$profile_dir/${profile}/Packages-Root"
+    root_list="$profile_dir/${profile}/Packages-Root"
-    ROOT_OVERLAY="$profile_dir/${profile}/root-overlay"
+    root_overlay="$profile_dir/${profile}/root-overlay"
 
-    [[ -f "$profile_dir/${profile}/Packages-Live" ]] && LIVE_LIST="$profile_dir/${profile}/Packages-Live"
+    [[ -f "$profile_dir/${profile}/Packages-Live" ]] && live_list="$profile_dir/${profile}/Packages-Live"
-    [[ -d "$profile_dir/${profile}/live-overlay" ]] && LIVE_OVERLAY="$profile_dir/${profile}/live-overlay"
+    [[ -d "$profile_dir/${profile}/live-overlay" ]] && live_overlay="$profile_dir/${profile}/live-overlay"
+
+    common_dir="${DATADIR}/iso-profiles/common"
+    [[ -d "$profile_dir"/common ]] && common_dir="${profile_dir}"/common
 
     [[ -f $profile_dir/${profile}/profile.conf ]] || return 1
 
@@ -35,28 +38,48 @@ load_profile(){
     return 0
 }
 
-load_pkgs(){
+read_from_list() {
-    local pkglist="$1" init="$2"
+    local list="$1"
-    msg2 "Loading Packages: [%s] ..." "${pkglist##*/}"
+    local _space="s| ||g"
+    local _clean=':a;N;$!ba;s/\n/ /g'
+    local _com_rm="s|#.*||g"
 
-    local _init="s|@$init||g" _init_rm1 _init_rm2
+    local _init="s|@initsys@|${INITSYS}|g"
-    case "$init" in
-        'openrc') _init_rm1="s|@runit.*||g"; _init_rm2="s|@s6.*||g" ;;
-        's6') _init_rm1="s|@runit.*||g"; _init_rm2="s|@openrc.*||g" ;;
-        'runit') _init_rm1="s|@s6.*||g"; _init_rm2="s|@openrc.*||g" ;;
-    esac
 
-    local _space="s| ||g" \
+    msg2 "Loading Packages: [%s] ..." "${list##*/}"
-        _clean=':a;N;$!ba;s/\n/ /g' \
+    packages+=($(sed "$_com_rm" "$list" \
-        _com_rm="s|#.*||g"
-
-    packages=($(sed "$_com_rm" "$pkglist" \
             | sed "$_space" \
-            | sed "$_purge" \
             | sed "$_init" \
-            | sed "$_init_rm1" \
-            | sed "$_init_rm2" \
             | sed "$_clean"))
 }
 
+read_from_services() {
+    for svc in "${SERVICES[@]}"; do
+        case "$svc" in
+            sddm|gdm|lightdm|mdm|greetd|lxdm|xdm) packages+=("$svc-${INITSYS}") ;;
+            NetworkManager) packages+=("networkmanager-${INITSYS}") ;;
+            connmand) packages+=("connman-${INITSYS}") ;;
+            cupsd) packages+=("cups-${INITSYS}") ;;
+            bluetoothd) packages+=("bluez-${INITSYS}") ;;
+            syslog-ng|metalog) packages+=("$svc-${INITSYS}") ;;
+        esac
+    done
+}
+
+load_pkgs(){
+    local pkglist="$1"
+    packages=()
+
+    if [[ "${pkglist##*/}" == "Packages-Root" ]]; then
+        read_from_list "${common_dir}/Packages-base"
+        read_from_list "${common_dir}/Packages-apps"
+        read_from_list "${common_dir}/Packages-${INITSYS}"
+        [[ -n "${live_list}" ]] && read_from_list "${common_dir}/Packages-xorg"
+        read_from_list "$pkglist"
+        read_from_services
+    else
+        read_from_list "$pkglist"
+    fi
+}
+
 #}}}

lib/iso/services.sh

@@ -24,29 +24,34 @@ add_svc_runit(){
 
 add_svc_s6(){
     local mnt="$1" names="$2" rlvl="${3:-default}" error ret
+    local db=/etc/s6/rc/compiled
     for svc in $names; do
         error=false
-        chroot "$mnt" s6-rc-db -c /etc/s6/rc/compiled type "$svc" &> /dev/null || error=true
+        chroot "$mnt" s6-rc-db -c "$db" type "$svc" &> /dev/null || error=true
         ret="$?"
         if [ $ret -eq 0 ] && [[ "$error" == false ]]; then
             msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
-            chroot "$mnt" s6-rc-bundle-update -c /etc/s6/rc/compiled add "$rlvl" "$svc"
+            chroot "$mnt" s6-rc-bundle-update -c "$db" add "$rlvl" "$svc"
         fi
     done
 
-    # force artix-live as a dependency if these display managers exist
+    local rlvl=/etc/s6/current
-#     for displaymanager in gdm lightdm-srv lxdm sddm; do
-#         if [ -f "${work_dir}"/rootfs/etc/s6/sv/$displaymanager/dependencies ]; then
-#             echo "artix-live" >> "${work_dir}"rootfs/etc/s6/sv/$displaymanager/dependencies
-#         fi
-#     done
-#     chroot "$mnt" sh /usr/share/libalpm/scripts/s6-rc-db-update-hook
-
     # rebuild s6-linux-init binaries
-    chroot "$mnt" rm -r /etc/s6/current
+    chroot "$mnt" rm -r "$rlvl"
-    chroot "$mnt" s6-linux-init-maker -1 -N -f /etc/s6/skel -G "/usr/bin/agetty -L -8 tty1 115200" -c /etc/s6/current /etc/s6/current
+    chroot "$mnt" s6-linux-init-maker -1 -N -f /etc/s6/skel -G "/usr/bin/agetty -L -8 tty1 115200" -c "$rlvl" "$rlvl"
-    chroot "$mnt" mv /etc/s6/current/bin/init /etc/s6/current/bin/s6-init
+    chroot "$mnt" mv "$rlvl"/bin/init "$rlvl"/bin/s6-init
-    chroot "$mnt" cp -a /etc/s6/current/bin /usr
+    chroot "$mnt" cp -a "$rlvl"/bin /usr
+}
+
+add_svc_66(){
+    local mnt="$1" names="$2"
+    chroot "$mnt" 66-tree -cnE root &>/dev/null
+    for svc in $names; do
+        if [[ -f "$mnt"/etc/66/service/"$svc" ]]; then
+            msg2 "Setting %s: [%s]" "${INITSYS}" "$svc"
+            chroot "$mnt" 66-enable -t root "$svc" &>/dev/null
+        fi
+    done
 }
 
 #}}}

lib/pkg/table.sh

@@ -8,13 +8,13 @@ msg_table_header(){
     printf "${BLUE} ${mesg} ${ALL_OFF}\n" "$@" >&2
 }
 
-msg_row_downgrade(){
+msg_row_yellow(){
     local mesg=$1; shift
     # shellcheck disable=2059
     printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@" >&2
 }
 
-msg_row_notify(){
+msg_row_green(){
     local mesg=$1; shift
     # shellcheck disable=2059
     printf "${GREEN} ${mesg}${ALL_OFF}\n" "$@" >&2
@@ -27,7 +27,7 @@ msg_row(){
     printf "${WHITE} ${mesg}${ALL_OFF}\n" "$@" >&2
 }
 
-msg_row_upgrade(){
+msg_row_red(){
     local mesg=$1; shift
     # shellcheck disable=2059
     printf "${RED} ${mesg} ${ALL_OFF}\n" "$@" >&2

lib/util-pkg.sh

@@ -31,7 +31,7 @@ load_pkg_config(){
         python-{world,galaxy}
     )
 
-    local init_tree=(packages-{openrc,runit,s6})
+    local init_tree=(packages-{openrc,runit,s6,66})
 
     local desktop_tree=(
         packages-{kf5,plasma,kde,qt6}