[lmi-commits] [lmi] master 3776d3f 17/18: Move one script's contents into another

[Greg Chicares]

branch: master
commit 3776d3fe6fe935aafcbedd6357b4ad73238ad9eb
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Move one script's contents into another
---
 install_centos.sh   |  2 --
 install_centos_1.sh | 11 +++++++++++
 install_centos_2.sh | 12 +-----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/install_centos.sh b/install_centos.sh
index 4fff747..6701bc7 100755
--- a/install_centos.sh
+++ b/install_centos.sh
@@ -48,7 +48,6 @@ wget -N -nv "${GIT_URL_BASE}"/lmi_setup_42.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_43.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_inc.sh
 wget -N -nv "${GIT_URL_BASE}"/install_centos_1.sh
-wget -N -nv "${GIT_URL_BASE}"/install_centos_2.sh
 chmod 0777 lmi_setup_*.sh
 chmod 0777 install_centos_*.sh
 
@@ -145,7 +144,6 @@ mount --bind /srv/cache_for_lmi 
/srv/chroot/centos7lmi/srv/cache_for_lmi
 # END   ./lmi_setup_13.sh
 
 schroot --chroot=centos7lmi --user=root --directory=/tmp ./install_centos_1.sh
-schroot --chroot=centos7lmi --user=root --directory=/tmp ./install_centos_2.sh
 
 # Copy log files that may be useful for tracking down problems with
 # certain commands whose output is voluminous and often uninteresting.
diff --git a/install_centos_1.sh b/install_centos_1.sh
index f539672..c14e1ec 100755
--- a/install_centos_1.sh
+++ b/install_centos_1.sh
@@ -45,3 +45,14 @@ yum --assumeyes install debootstrap schroot
 du   -sb /srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi || echo "Okay."
 mkdir -p /srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi
 mount --bind /srv/cache_for_lmi /srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi
+
+# ./lmi_setup_10.sh
+# ./lmi_setup_11.sh
+cp -a lmi_setup_*.sh /tmp/schroot_env /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
+sudo                         --user="${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
+schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_42.sh
+schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_43.sh
diff --git a/install_centos_2.sh b/install_centos_2.sh
index 15fb418..dfa81a6 100755
--- a/install_centos_2.sh
+++ b/install_centos_2.sh
@@ -28,14 +28,4 @@ set -evx
 
 assert_su
 assert_not_chrooted
-
-# ./lmi_setup_10.sh
-# ./lmi_setup_11.sh
-cp -a lmi_setup_*.sh /tmp/schroot_env /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
-sudo                         --user="${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
-schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_42.sh
-schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_43.sh
+# Nothing here--ready to remove.