[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 4cd422c 1/8: Prevent 'findmnt' from failing i
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 4cd422c 1/8: Prevent 'findmnt' from failing in a 'set -e' script |
Date: |
Sun, 6 Oct 2019 19:48:10 -0400 (EDT) |
branch: master
commit 4cd422c81069bd91df1740635a7d13404dad86d0
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Prevent 'findmnt' from failing in a 'set -e' script
---
install_centos.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/install_centos.sh b/install_centos.sh
index 1dee78d..01300e3 100755
--- a/install_centos.sh
+++ b/install_centos.sh
@@ -45,7 +45,7 @@ rinse --arch amd64 --distribution centos-7 \
--mirror http://mirror.net.cen.ct.gov/centos/7.7.1908/os/x86_64/Packages \
# There should be no bind mounts yet:
-findmnt --kernel -n --list | grep '\['
+findmnt --kernel -n --list | grep '\[' |sort
# Now centos has its own cache directory, with subdirectories:
ls /srv/chroot/centos7lmi/var/cache/yum
@@ -57,7 +57,7 @@ mkdir -p /var/cache/centos_lmi
du -sb /var/cache/centos_lmi
# 'rbind' seems necessary because centos uses subdirs
mount --rbind /var/cache/centos_lmi /srv/chroot/centos7lmi/var/cache/yum ||
echo "Oops"
-findmnt --kernel -n --list | grep '\['
+findmnt --kernel -n --list | grep '\[' |sort
cat >/srv/chroot/centos7lmi/tmp/setup0.sh <<EOF
#!/bin/sh
@@ -147,17 +147,17 @@ EOF
# This seems to work perfectly:
mkdir /srv/chroot/centos7lmi/srv/chroot/"${CHRTNAME}"/cache_for_lmi
mount --bind /srv/cache_for_lmi
/srv/chroot/centos7lmi/srv/chroot/"${CHRTNAME}"/cache_for_lmi || echo "Oops"
-findmnt --kernel -n --list | grep '\['
+findmnt --kernel -n --list | grep '\[' |sort
# At this point, the debian chroot's /var/cache/apt/archives/
# directory exists, but is empty:
du -sb /srv/chroot/centos7lmi/srv/chroot/"${CHRTNAME}"/var/cache/apt/archives
# The host's apt archives contain:
du -sb /var/cache/"${CODENAME}"
-findmnt --kernel -n --list | grep '\['
+findmnt --kernel -n --list | grep '\[' |sort
mount --bind /var/cache/"${CODENAME}"
/srv/chroot/centos7lmi/srv/chroot/"${CHRTNAME}"/var/cache/apt/archives || echo
"Oops"
-findmnt --kernel -n --list | grep '\['
+findmnt --kernel -n --list | grep '\[' |sort
cat >/srv/chroot/centos7lmi/tmp/setup1.sh <<EOF
#!/bin/sh
@@ -210,7 +210,7 @@ schroot --chroot=centos7lmi --user=root --directory=/tmp
./setup1.sh
du -sb /srv/chroot/centos7lmi/srv/chroot/"${CHRTNAME}"/var/cache/apt/archives
du -sb /var/cache/"${CODENAME}"
-findmnt --kernel -n --list | grep '\['
+findmnt --kernel -n --list | grep '\[' |sort
stamp1=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
echo "Finished: $stamp1"
- [lmi-commits] [lmi] master updated (b80b1ae -> bd24b46), Greg Chicares, 2019/10/06
- [lmi-commits] [lmi] master 04cbbca 4/8: Let 'set -e' halt on bind-mount failure, Greg Chicares, 2019/10/06
- [lmi-commits] [lmi] master 954ab11 7/8: Use 'yum' to install "EPEL", Greg Chicares, 2019/10/06
- [lmi-commits] [lmi] master c6802d2 2/8: Expunge comments related to the resolved circular-mounts issue, Greg Chicares, 2019/10/06
- [lmi-commits] [lmi] master 282907b 5/8: List handy commands to destroy a centos chroot, Greg Chicares, 2019/10/06
- [lmi-commits] [lmi] master d8d46c3 6/8: Comment out 'scl' stuff, Greg Chicares, 2019/10/06
- [lmi-commits] [lmi] master bd24b46 8/8: Install 'debootstrap', not 'debootstrap.noarch', Greg Chicares, 2019/10/06
- [lmi-commits] [lmi] master 4cd422c 1/8: Prevent 'findmnt' from failing in a 'set -e' script,
Greg Chicares <=
- [lmi-commits] [lmi] master 71e8adb 3/8: Remove code to trace bind-mount activity, Greg Chicares, 2019/10/06