[lmi-commits] [lmi] master 455d59e 11/18: Rearrange some script blocks

[Greg Chicares]

branch: master
commit 455d59e35bb8d4380c53de7824eb605992fd220a
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Rearrange some script blocks
    
    Moved mounts for /srv/cache_for_lmi/ into a new block #13 for now.
---
 install_centos.sh   | 16 ++--------------
 install_centos_1.sh | 12 ++++++++++++
 install_redhat.sh   | 10 ++++++----
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/install_centos.sh b/install_centos.sh
index 21334ea..0dd0dc5 100755
--- a/install_centos.sh
+++ b/install_centos.sh
@@ -139,19 +139,7 @@ cp -a ~/.zshrc 
/srv/chroot/centos7lmi/home/"${NORMAL_USER}"/.zshrc
 # If that works well, then treat vim configuration the same way,
 # here and elsewhere.
 
-# BEGIN ./lmi_setup_11.sh
-cat >/srv/chroot/centos7lmi/etc/schroot/chroot.d/"${CHRTNAME}".conf <<EOF
-[${CHRTNAME}]
-aliases=lmi
-description=debian ${CODENAME} cross build ${CHRTVER}
-directory=/srv/chroot/${CHRTNAME}
-users=${CHROOT_USERS}
-groups=${NORMAL_GROUP}
-root-groups=root
-shell=/bin/zsh
-type=plain
-EOF
-
+# BEGIN ./lmi_setup_13.sh
 mkdir -p /srv/cache_for_lmi
 du   -sb /srv/chroot/centos7lmi/srv/cache_for_lmi || echo "Okay."
 mkdir -p /srv/chroot/centos7lmi/srv/cache_for_lmi
@@ -160,7 +148,7 @@ mount --bind /srv/cache_for_lmi 
/srv/chroot/centos7lmi/srv/cache_for_lmi
 du   -sb /srv/chroot/centos7lmi/srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi || 
echo "Okay."
 mkdir -p /srv/chroot/centos7lmi/srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi
 mount --bind /srv/cache_for_lmi 
/srv/chroot/centos7lmi/srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi
-# END   ./lmi_setup_11.sh
+# END   ./lmi_setup_13.sh
 
 schroot --chroot=centos7lmi --user=root --directory=/tmp ./install_centos_2.sh
 
diff --git a/install_centos_1.sh b/install_centos_1.sh
index 4fbec9c..956ffa0 100755
--- a/install_centos_1.sh
+++ b/install_centos_1.sh
@@ -61,6 +61,18 @@ debootstrap --arch=amd64 --cache-dir="${CACHEDIR}" \
 # This command should produce no output:
 grep --invert-match '^I:' "${CHRTNAME}"-debootstrap-log
 
+cat >/etc/schroot/chroot.d/"${CHRTNAME}".conf <<EOF
+[${CHRTNAME}]
+aliases=lmi
+description=debian ${CODENAME} cross build ${CHRTVER}
+directory=/srv/chroot/${CHRTNAME}
+users=${CHROOT_USERS}
+groups=${NORMAL_GROUP}
+root-groups=root
+shell=/bin/zsh
+type=plain
+EOF
+
 # Experimentally show whether anything's already here:
 du   -sb /srv/chroot/"${CHRTNAME}"/var/cache/apt/archives
 # Bind-mount apt archives for the chroot's debian release. Do this:
diff --git a/install_redhat.sh b/install_redhat.sh
index 2b3a9ef..8b629e6 100755
--- a/install_redhat.sh
+++ b/install_redhat.sh
@@ -138,14 +138,16 @@ du   -sb /srv/chroot/"${CHRTNAME}"/var/cache/apt/archives
 #   - while not chrooted, so that the host filesystem is accessible.
 mount --bind "${CACHEDIR}" /srv/chroot/"${CHRTNAME}"/var/cache/apt/archives
 
+echo Installed debian "${CODENAME}" chroot.
+# END   ./lmi_setup_11.sh
+# ./lmi_setup_11.sh
+
+# BEGIN ./lmi_setup_13.sh
 mkdir -p /srv/cache_for_lmi
 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
-
-echo Installed debian "${CODENAME}" chroot.
-# END   ./lmi_setup_11.sh
-# ./lmi_setup_11.sh
+# END   ./lmi_setup_13.sh
 
 cp -a lmi_setup_*.sh /tmp/schroot_env /srv/chroot/${CHRTNAME}/tmp
 schroot --chroot=${CHRTNAME} --user=root             --directory=/tmp 
./lmi_setup_20.sh