Changeset 249d4ad

Timestamp:

11/16/2023 03:10:46 PM (6 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

078ef3c

Parents:

09ac7fc

Message:

Fix (again) the run-in-cgroup.sh script

When using "sh << EOF", what is between this line and EOF runs
with no attached terminal. But we need a terminal for running the
build. So we have to use "sh -c ". But then nesting of double
quotes, $, etc is too complicated. So run as root, and become back
user only when exec'ing. For some reason $@ does not work, so use
a variable set to $@.

File:

• common/run-in-cgroup.sh (modified) (2 diffs)

common/run-in-cgroup.sh

@@ -5 +5 @@
         exit 1
 fi
+
+ARGS="$@"
 
 set +e
@@ -18 +20 @@
    (
       sudo sh -c "echo $BASHPID > /sys/fs/cgroup/jhalfs/cgroup.procs"
-      sudo -u $(whoami) sh <<EOF
+      sudo sh -c "
          SESS_CGROUP=/sys/fs/cgroup/\$XDG_SESSION_ID
-         sudo sh -c "echo \\"$CPUSPEC\\" > \$SESS_CGROUP/cpuset.cpus"
-         (sudo sh -c "echo \$BASHPID > \$SESS_CGROUP/cgroup.procs" &&
-            exec $@)
-EOF
+         echo $CPUSPEC > \$SESS_CGROUP/cpuset.cpus
+         ( echo \$BASHPID > \$SESS_CGROUP/cgroup.procs &&
+                 exec sudo -u $(whoami) $ARGS )"
    )
    sudo rmdir /sys/fs/cgroup/jhalfs