lmi-commits
[Top][All Lists]
Advanced

[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.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]