[lmi-commits] [lmi] master 8d2c26b 03/18: Fold unborn chroot step #12 into step #20

[Greg Chicares]

branch: master
commit 8d2c26bbbd2855a4fd27695260f025fad82f51a1
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Fold unborn chroot step #12 into step #20
    
    It is cleaner to change this /etc/skel file while inside the chroot.
    
    The nuisance was manifest only on a corporate server that doesn't allow
    chsh even with sudo, so that everyone's shell is bash. Now, it's avoided
    in all cases.
---
 install_redhat.sh | 6 ------
 lmi_setup_20.sh   | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/install_redhat.sh b/install_redhat.sh
index b352923..ba6ad19 100755
--- a/install_redhat.sh
+++ b/install_redhat.sh
@@ -125,12 +125,6 @@ mount --bind /srv/cache_for_lmi 
/srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi
 # END   ./lmi_setup_11.sh
 # ./lmi_setup_11.sh
 
-# BEGIN ./lmi_setup_12.sh
-# Suppress a nuisance: debian-based distributions provide a default
-# bash logout file that clears the screen.
-sed -e'/^[^#]/s/^/# SUPPRESSED # /' -i 
/srv/chroot/"${CHRTNAME}"/etc/skel/.bash_logout
-# END   ./lmi_setup_12.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/lmi_setup_20.sh b/lmi_setup_20.sh
index afa9430..a9443d2 100755
--- a/lmi_setup_20.sh
+++ b/lmi_setup_20.sh
@@ -56,6 +56,10 @@ ln -s /bin/true /usr/bin/ischroot
 # as of 2019-03, and the underlying defect is still unresolved:
 #   https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685034
 
+# Suppress a nuisance: debian-based distributions provide a default
+# bash logout file that clears the screen.
+sed -e'/^[^#]/s/^/# SUPPRESSED # /' -i /etc/skel/.bash_logout
+
 # This being a "plain" schroot, mount essential directories:
 mount -t devpts -o rw,nosuid,noexec,relatime,mode=600 devpts /dev/pts
 mount -t proc -o rw,nosuid,nodev,noexec,relatime proc /proc