Attempt to re-add /etc/passwd fiddling (Niri only).

It was added to potentially cancel superseded running tasks, but it was
also making the `niri` build wait until the `gnome` build was done. My
bad.

.gitea/workflows/build.yml

@@ -27,12 +27,6 @@ env:
     https://davejansen.dev/${{ github.repository_owner }}/${{
     github.event.repository.name }}
 
-concurrency:
-  group:
-    ${{ github.workflow }}-${{ github.ref || github.run_id }}-${{
-    inputs.brand_name}}-${{ inputs.stream_name }}
-  cancel-in-progress: true
-
 jobs:
   build_push:
     name: Build and push image
@@ -47,6 +41,12 @@ jobs:
       packages: write
       id-token: write
 
+    concurrency:
+      group:
+        ${{ github.workflow }}-${{ github.ref || github.run_id }}-${{
+        matrix.variant }}
+      cancel-in-progress: true
+
     steps:
       - name: Prepare environment
         run: |

build_files/niri/cleanup.sh

@@ -52,16 +52,16 @@ chmod -R 1777 /var/tmp
 ## Handle files that rpm-ostree would normally remove
 ## Adapted from: https://github.com/hhd-dev/rechunk/blob/master/1_prune.sh#L33
 
-# if [ -f /etc/passwd ]; then
-#   out="$(grep -v 'root' /etc/passwd)"
-#
-#   if [[ ! -z "$out" ]]; then
-#     echo
-#     echo Appending the following passwd users to /usr/lib/passwd
-#     echo "${out}"
-#     echo "$out" >>/usr/lib/passwd
-#   fi
-# fi
+if [ -f /etc/passwd ]; then
+  out="$(grep -v 'root' /etc/passwd)"
+
+  if [[ ! -z "$out" ]]; then
+    echo
+    echo Appending the following passwd users to /usr/lib/passwd
+    echo "${out}"
+    echo "$out" >>/usr/lib/passwd
+  fi
+fi
 
 if [ -f /etc/group ]; then
   out="$(grep -v 'root\|wheel' /etc/group)"