[lmi-commits] [lmi] odd/rh_server 0ff90f8: Pass parameters to chroot, uglily

[Greg Chicares]

branch: odd/rh_server
commit 0ff90f8e5737cac6552d38cb5195ed4896633a55
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Pass parameters to chroot, uglily
    
    This actually does work, at least for the 'lmi_setup_21.sh' script.
    But it's appalling.
---
 gwc/rebuild_redhat.sh | 18 ++++++++++++++++++
 install_redhat.sh     |  3 ++-
 lmi_setup_inc.sh      | 16 ++++++++++------
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/gwc/rebuild_redhat.sh b/gwc/rebuild_redhat.sh
new file mode 100755
index 0000000..e919a36
--- /dev/null
+++ b/gwc/rebuild_redhat.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+export HOST_NORMAL_USER
+export HOST_NORMAL_USER_UID
+export HOST_NORMAL_GROUP
+export HOST_NORMAL_GROUP_GID
+HOST_NORMAL_USER=$(id -un "$(logname)")
+HOST_NORMAL_USER_UID=$(id -u "$(logname)")
+HOST_NORMAL_GROUP=$(id -gn "$(logname)")
+HOST_NORMAL_GROUP_GID=$(id -g "$(logname)")
+cd /opt/lmi/src/lmi || exit 9
+git pull
+stamp=$(date -u +'%Y%m%dT%H%MZ')
+# run as superuser, but redirect output as normal user
+# shellcheck disable=SC2024
+sudo -E ./install_redhat.sh >/home/REDACTED/rhlog_"${stamp}" 2>&1
+cp -a /srv/chroot/lmi_bullseye_1/home/REDACTED/log  ~/lmi_rhlog_"${stamp}"
+cp /srv/chroot/lmi_bullseye_1/tmp/lmi_bullseye_1-apt-get-log 
~/apt-get-log-"${stamp}"
diff --git a/install_redhat.sh b/install_redhat.sh
index 42042db..1a46caf 100755
--- a/install_redhat.sh
+++ b/install_redhat.sh
@@ -131,7 +131,8 @@ set -evx
 # ./lmi_setup_11.sh
 cp -a lmi_setup_*.sh /srv/chroot/${CHRTNAME}/tmp
 schroot --chroot=${CHRTNAME} --user=root --directory=/tmp ./lmi_setup_20.sh
-schroot --chroot=${CHRTNAME} --user=root --directory=/tmp ./lmi_setup_21.sh
+#schroot --chroot=${CHRTNAME} --user=root --directory=/tmp ./lmi_setup_21.sh
+schroot --chroot=${CHRTNAME} --user=root --directory=/tmp -- sh -c 
"HOST_NORMAL_USER=${HOST_NORMAL_USER} 
HOST_NORMAL_USER_UID=${HOST_NORMAL_USER_UID} 
HOST_NORMAL_GROUP=${HOST_NORMAL_GROUP} 
HOST_NORMAL_GROUP_GID=${HOST_NORMAL_GROUP_GID} ./lmi_setup_21.sh"
 sudo -u "${NORMAL_USER}" ./lmi_setup_30.sh
 schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_40.sh
 schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_41.sh
diff --git a/lmi_setup_inc.sh b/lmi_setup_inc.sh
index f8eac42..5386e1f 100755
--- a/lmi_setup_inc.sh
+++ b/lmi_setup_inc.sh
@@ -38,13 +38,17 @@ set -vx
 CODENAME=bullseye
 CHRTVER=1
 CHRTNAME=lmi_${CODENAME}_${CHRTVER}
-NORMAL_USER=$(id -un "$(logname)")
-NORMAL_USER_UID=$(id -u "$(logname)")
-NORMAL_GROUP=$(id -gn "$(logname)")
-NORMAL_GROUP_GID=$(id -g "$(logname)")
-GIT_URL_BASE=https://git.savannah.nongnu.org/cgit/lmi.git/plain
+#NORMAL_USER=$(id -un "$(logname)")
+#NORMAL_USER_UID=$(id -u "$(logname)")
+#NORMAL_GROUP=$(id -gn "$(logname)")
+#NORMAL_GROUP_GID=$(id -g "$(logname)")
+NORMAL_USER=${HOST_NORMAL_USER}
+NORMAL_USER_UID=${HOST_NORMAL_USER_UID}
+NORMAL_GROUP=${HOST_NORMAL_GROUP}
+NORMAL_GROUP_GID=${HOST_NORMAL_GROUP_GID}
+# GIT_URL_BASE=https://git.savannah.nongnu.org/cgit/lmi.git/plain
 # For a server that, bizarrely, blocks gnu.org but allows github.com:
-# GIT_URL_BASE=https://github.com/vadz/lmi/raw/master
+GIT_URL_BASE=https://github.com/vadz/lmi/raw/master
 
 set +vx