forked from josch/mmdebstrap
make_mirror.sh: annotate each line with timestamp
This commit is contained in:
parent
473bc354ae
commit
ed1899476c
1 changed files with 16 additions and 2 deletions
|
@ -282,14 +282,28 @@ echo 'root:root' | chpasswd
|
||||||
mount -t 9p -o trans=virtio,access=any mmdebstrap /mnt
|
mount -t 9p -o trans=virtio,access=any mmdebstrap /mnt
|
||||||
# need to restart mini-httpd because we mounted different content into www-root
|
# need to restart mini-httpd because we mounted different content into www-root
|
||||||
systemctl restart mini-httpd
|
systemctl restart mini-httpd
|
||||||
|
|
||||||
|
handler () {
|
||||||
|
while IFS= read -r line || [ -n "$line" ]; do
|
||||||
|
printf "%s %s: %s\n" "$(date +%T.%3N)" "$1" "$line"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
(
|
(
|
||||||
cd /mnt;
|
cd /mnt;
|
||||||
if [ -e cover_db.img ]; then
|
if [ -e cover_db.img ]; then
|
||||||
mkdir -p cover_db
|
mkdir -p cover_db
|
||||||
mount -o loop,umask=000 cover_db.img cover_db
|
mount -o loop,umask=000 cover_db.img cover_db
|
||||||
fi
|
fi
|
||||||
sh -x ./test.sh
|
|
||||||
ret=$?
|
ret=0
|
||||||
|
{ { { { {
|
||||||
|
sh -x ./test.sh 2>&1 1>&4 3>&- 4>&-; echo $? >&2;
|
||||||
|
} | handler E >&3;
|
||||||
|
} 4>&1 | handler O >&3;
|
||||||
|
} 2>&1;
|
||||||
|
} | { read xs; exit $xs; };
|
||||||
|
} 3>&1 || ret=$?
|
||||||
if [ -e cover_db.img ]; then
|
if [ -e cover_db.img ]; then
|
||||||
df -h cover_db
|
df -h cover_db
|
||||||
umount cover_db
|
umount cover_db
|
||||||
|
|
Loading…
Reference in a new issue