[lmi-commits] [lmi] master 932c27b 01/18: Consolidate chroot step #10

[Greg Chicares]

branch: master
commit 932c27b13c47c093b25f6c4d89e9241fdde23ebf
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Consolidate chroot step #10
---
 install_centos.sh   | 5 ++++-
 install_centos_1.sh | 5 +----
 install_redhat.sh   | 5 +----
 lmi_setup_10.sh     | 5 ++++-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/install_centos.sh b/install_centos.sh
index d5c9d34..0ec2db5 100755
--- a/install_centos.sh
+++ b/install_centos.sh
@@ -103,8 +103,11 @@ shell=/bin/zsh
 type=plain
 EOF
 
+# BEGIN ./lmi_setup_10c.sh
 apt-get update
-apt-get --assume-yes install schroot rinse
+apt-get --assume-yes install rinse schroot
+# END   ./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 f37efab..41460a7 100755
--- a/install_centos_1.sh
+++ b/install_centos_1.sh
@@ -34,14 +34,11 @@ assert_not_chrooted
 ./lmi_setup_07r.sh
 
 # BEGIN ./lmi_setup_10.sh
-yum --assumeyes install schroot
-# To show available debootstrap scripts:
-#   ls /usr/share/debootstrap/scripts
+yum --assumeyes install debootstrap schroot
 # END   ./lmi_setup_10.sh
 
 # BEGIN ./lmi_setup_11.sh
 # Install a debian chroot inside this centos chroot.
-yum --assumeyes install debootstrap
 mkdir -p /srv/chroot/"${CHRTNAME}"
 debootstrap "${CODENAME}" /srv/chroot/"${CHRTNAME}" 
http://deb.debian.org/debian/
 
diff --git a/install_redhat.sh b/install_redhat.sh
index 1608307..3120e29 100755
--- a/install_redhat.sh
+++ b/install_redhat.sh
@@ -99,14 +99,11 @@ mount --bind /var/cache/"${CODENAME}" 
/srv/chroot/"${CHRTNAME}"/var/cache/apt/ar
 ./lmi_setup_07r.sh
 
 # BEGIN ./lmi_setup_10.sh
-yum --assumeyes install schroot
-# To show available debootstrap scripts:
-#   ls /usr/share/debootstrap/scripts
+yum --assumeyes install debootstrap schroot
 # END   ./lmi_setup_10.sh
 
 # BEGIN ./lmi_setup_11.sh
 # Install a debian chroot inside this redhat chroot.
-yum --assumeyes install debootstrap
 mkdir -p /srv/chroot/"${CHRTNAME}"
 debootstrap "${CODENAME}" /srv/chroot/"${CHRTNAME}" 
http://deb.debian.org/debian/
 
diff --git a/lmi_setup_10.sh b/lmi_setup_10.sh
index 364abd1..453f863 100755
--- a/lmi_setup_10.sh
+++ b/lmi_setup_10.sh
@@ -30,4 +30,7 @@ assert_su
 assert_not_chrooted
 
 apt-get update
-apt-get --assume-yes install schroot debootstrap
+apt-get --assume-yes install debootstrap schroot
+
+# To show available debootstrap scripts:
+#   ls /usr/share/debootstrap/scripts