[lmi-commits] [lmi] master 496a16e 1/2: Extract marked blocks into sub-scripts #10

[Greg Chicares]

branch: master
commit 496a16eff593d68580786f04e022bed0524f6aea
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Extract marked blocks into sub-scripts #10
---
 install_centos.sh   |  8 +++-----
 install_centos_1.sh | 15 +++++----------
 install_redhat.sh   | 11 ++++-------
 lmi_setup_10c.sh    | 33 +++++++++++++++++++++++++++++++++
 lmi_setup_10r.sh    | 35 +++++++++++++++++++++++++++++++++++
 5 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/install_centos.sh b/install_centos.sh
index 6eb1d36..f8bac69 100755
--- a/install_centos.sh
+++ b/install_centos.sh
@@ -37,7 +37,8 @@ fi
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_02c.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_05c.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_07r.sh
-wget -N -nv "${GIT_URL_BASE}"/lmi_setup_10.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_10c.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_10r.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_11.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_20.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_21.sh
@@ -102,10 +103,7 @@ shell=/bin/zsh
 type=plain
 EOF
 
-# BEGIN ./lmi_setup_10c.sh
-apt-get update
-apt-get --assume-yes install rinse schroot
-# END   ./lmi_setup_10c.sh
+./lmi_setup_10c.sh
 
 rinse --arch amd64 --distribution centos-7 \
   --directory /srv/chroot/centos7lmi \
diff --git a/install_centos_1.sh b/install_centos_1.sh
index c14e1ec..172e3fc 100755
--- a/install_centos_1.sh
+++ b/install_centos_1.sh
@@ -30,24 +30,19 @@ assert_su
 assert_not_chrooted
 
 ./lmi_setup_05c.sh
-
 ./lmi_setup_07r.sh
-
-# BEGIN ./lmi_setup_10.sh
-yum --assumeyes install debootstrap schroot
-# END   ./lmi_setup_10.sh
-
+./lmi_setup_10r.sh
 ./lmi_setup_11.sh
 
-# Experimental--see
+# BEGIN ./lmi_setup_13.sh
+# For caveats, see:
 #    https://lists.nongnu.org/archive/html/lmi/2020-05/msg00040.html
-# for caveats.
+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
+# END   ./lmi_setup_13.sh
 
-# ./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
diff --git a/install_redhat.sh b/install_redhat.sh
index aa44869..5eb3b85 100755
--- a/install_redhat.sh
+++ b/install_redhat.sh
@@ -37,7 +37,7 @@ fi
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_02.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_05r.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_07r.sh
-wget -N -nv "${GIT_URL_BASE}"/lmi_setup_10.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_10r.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_11.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_20.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_21.sh
@@ -88,15 +88,12 @@ chmod 0666 /tmp/schroot_env
 ./lmi_setup_02.sh
 ./lmi_setup_05r.sh
 ./lmi_setup_07r.sh
-
-# BEGIN ./lmi_setup_10.sh
-yum --assumeyes install debootstrap schroot
-# END   ./lmi_setup_10.sh
-# ./lmi_setup_10.sh
-
+./lmi_setup_10r.sh
 ./lmi_setup_11.sh
 
 # BEGIN ./lmi_setup_13.sh
+# For caveats, see:
+#    https://lists.nongnu.org/archive/html/lmi/2020-05/msg00040.html
 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
diff --git a/lmi_setup_10c.sh b/lmi_setup_10c.sh
new file mode 100755
index 0000000..6db97c2
--- /dev/null
+++ b/lmi_setup_10c.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# Create a chroot for cross-building "Let me illustrate...".
+#
+# Copyright (C) 2016, 2017, 2018, 2019, 2020 Gregory W. Chicares.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# http://savannah.nongnu.org/projects/lmi
+# email: <address@hidden>
+# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+
+. ./lmi_setup_inc.sh
+. /tmp/schroot_env
+
+set -vx
+
+assert_su
+assert_not_chrooted
+
+apt-get update
+apt-get --assume-yes install rinse schroot
diff --git a/lmi_setup_10r.sh b/lmi_setup_10r.sh
new file mode 100755
index 0000000..7e02d17
--- /dev/null
+++ b/lmi_setup_10r.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+# Create a chroot for cross-building "Let me illustrate...".
+#
+# Copyright (C) 2016, 2017, 2018, 2019, 2020 Gregory W. Chicares.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# http://savannah.nongnu.org/projects/lmi
+# email: <address@hidden>
+# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+
+. ./lmi_setup_inc.sh
+. /tmp/schroot_env
+
+set -vx
+
+assert_su
+assert_not_chrooted
+
+yum --assumeyes install debootstrap schroot
+
+# To show available debootstrap scripts:
+#   ls /usr/share/debootstrap/scripts