[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 6a0b050 06/12: Refactor to make multi-user co
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 6a0b050 06/12: Refactor to make multi-user configuration easier |
Date: |
Thu, 11 Jun 2020 20:58:33 -0400 (EDT) |
branch: master
commit 6a0b0508ef79fe58dc7d918f82926e49b7839ac0
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Refactor to make multi-user configuration easier
---
lmi_setup_01.sh | 4 ++++
lmi_setup_01c.sh | 4 ++++
lmi_setup_01r.sh | 3 +++
lmi_setup_05c.sh | 2 --
lmi_setup_21.sh | 4 ----
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/lmi_setup_01.sh b/lmi_setup_01.sh
index 91a3dcb..47306fd 100755
--- a/lmi_setup_01.sh
+++ b/lmi_setup_01.sh
@@ -42,6 +42,10 @@ cp -a install_msw.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_24.sh
+schroot --chroot=${CHRTNAME} --user=root --directory=/tmp
./lmi_setup_25.sh
+schroot --chroot=${CHRTNAME} --user=root --directory=/tmp
./lmi_setup_29.sh
+
# On a particular corporate server, root is not a sudoer.
if sudo -l true; then
sudo --user="${NORMAL_USER}"
./lmi_setup_30.sh
diff --git a/lmi_setup_01c.sh b/lmi_setup_01c.sh
index 702c746..7f852be 100755
--- a/lmi_setup_01c.sh
+++ b/lmi_setup_01c.sh
@@ -35,6 +35,7 @@ assert_not_chrooted
./lmi_setup_11.sh
./lmi_setup_13.sh
+./lmi_setup_24c.sh
./lmi_setup_25.sh
cp -a /tmp/schroot_env /srv/chroot/"${CHRTNAME}"/tmp
@@ -46,6 +47,9 @@ cp -a install_msw.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_24.sh
+schroot --chroot=${CHRTNAME} --user=root --directory=/tmp
./lmi_setup_25.sh
+schroot --chroot=${CHRTNAME} --user=root --directory=/tmp
./lmi_setup_29.sh
# On a particular corporate server, root is not a sudoer.
if sudo -l true; then
sudo --user="${NORMAL_USER}"
./lmi_setup_30.sh
diff --git a/lmi_setup_01r.sh b/lmi_setup_01r.sh
index 80d1821..ef4a90c 100755
--- a/lmi_setup_01r.sh
+++ b/lmi_setup_01r.sh
@@ -45,6 +45,9 @@ cp -a install_msw.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_24.sh
+schroot --chroot=${CHRTNAME} --user=root --directory=/tmp
./lmi_setup_25.sh
+schroot --chroot=${CHRTNAME} --user=root --directory=/tmp
./lmi_setup_29.sh
# On a particular corporate server, root is not a sudoer.
if sudo -l true; then
sudo --user="${NORMAL_USER}"
./lmi_setup_30.sh
diff --git a/lmi_setup_05c.sh b/lmi_setup_05c.sh
index 3030b26..578f435 100755
--- a/lmi_setup_05c.sh
+++ b/lmi_setup_05c.sh
@@ -59,7 +59,5 @@ yum --assumeyes install ncurses-term less sudo vim zsh
chsh -s /bin/zsh root
-./lmi_setup_24c.sh
-
stamp=$(date -u +'%Y%m%dT%H%M%SZ')
echo "$stamp $0: Reconfigured centos chroot." | tee /dev/tty
diff --git a/lmi_setup_21.sh b/lmi_setup_21.sh
index 83edd75..033962f 100755
--- a/lmi_setup_21.sh
+++ b/lmi_setup_21.sh
@@ -29,10 +29,6 @@ set -evx
assert_su
assert_chrooted
-./lmi_setup_24.sh
-./lmi_setup_25.sh
-./lmi_setup_29.sh
-
# Repair /usr/share/libtool/.../ltmain.sh as indicated here:
# https://lists.gnu.org/archive/html/libtool-patches/2011-06/msg00001.html
# Do this as root because root owns the file to be patched.
- [lmi-commits] [lmi] master updated (df723ac -> 0331fca), Greg Chicares, 2020/06/11
- [lmi-commits] [lmi] master 14ff0cb 01/12: Add a note about branching, Greg Chicares, 2020/06/11
- [lmi-commits] [lmi] master c7016ba 05/12: Add all groups before adding any user, Greg Chicares, 2020/06/11
- [lmi-commits] [lmi] master 6e50a5d 02/12: Create a root-owned file in root's $HOME, not someone else's, Greg Chicares, 2020/06/11
- [lmi-commits] [lmi] master 6a0b050 06/12: Refactor to make multi-user configuration easier,
Greg Chicares <=
- [lmi-commits] [lmi] master a75ef22 04/12: Extract blocks into sub-scripts #24, Greg Chicares, 2020/06/11
- [lmi-commits] [lmi] master 8bf7f0e 03/12: Extract block into sub-script #29, Greg Chicares, 2020/06/11
- [lmi-commits] [lmi] master 0331fca 12/12: Configure 'wine' for each user, Greg Chicares, 2020/06/11
- [lmi-commits] [lmi] master 4dcd8ee 08/12: Restrict permissions to 644 for home-directory files, Greg Chicares, 2020/06/11
- [lmi-commits] [lmi] master 9ef51ab 09/12: Configure all users, Greg Chicares, 2020/06/11
- [lmi-commits] [lmi] master 0d823ab 11/12: Merge 'lmi_setup_41.sh' into 'lmi_setup_40.sh', Greg Chicares, 2020/06/11
- [lmi-commits] [lmi] master bd371a2 10/12: Move git configuration, Greg Chicares, 2020/06/11
- [lmi-commits] [lmi] master ad3d008 07/12: Simplify vim and zsh configuration, Greg Chicares, 2020/06/11