summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Chant <achant@google.com>2022-07-22 16:52:51 -0700
committerKonstantin Vyshetsky <vkon@google.com>2022-08-01 18:00:49 +0000
commitb108713200e91992aafb45f3d69f3241c9cac3cb (patch)
treef7fa4aea0dca2b5b3cabe15e3ee5875dce9ae661
parent83e0b84caf41c42fd3f0b6494017570bd88f6e6e (diff)
downloadgs201-b108713200e91992aafb45f3d69f3241c9cac3cb.tar.gz
gs201: convert_to_ext4: copy .files, fix md5sum
Copy files in persist/.* Don't leave md5sums file in the persist folder. Bug: 239632964 Signed-off-by: Andrew Chant <achant@google.com> Change-Id: I7d351806f95ccc28fcfec4d45ecf3bda488e7e15
-rw-r--r--convert_to_ext4.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/convert_to_ext4.sh b/convert_to_ext4.sh
index 244d86b..a349df9 100644
--- a/convert_to_ext4.sh
+++ b/convert_to_ext4.sh
@@ -109,6 +109,7 @@ while [[ $RETRIES -gt 0 ]]; do
continue
fi
+ cp -rp $MNT_OLD/.* $MNT_NEW/
cp -rp $MNT_OLD/* $MNT_NEW/
check_success "cp -rp $MNT_OLD/* $MNT_NEW/"
if [ $? -ne 0 ]; then
@@ -120,11 +121,12 @@ while [[ $RETRIES -gt 0 ]]; do
fi
# Calculate md5sum of all files and compare between persist and efs
- (cd $MNT_NEW; find . -type f | xargs md5sum | sort) > $MNT_NEW/md5sums
- (cd $MNT_OLD; find . -type f | xargs md5sum | sort) > $MNT_OLD/md5sums
- diff -q $MNT_NEW/md5sums $MNT_OLD/md5sums
- check_success "diff -q $MNT_NEW/md5sums $MNT_OLD/md5sums"
+ (cd $MNT_NEW; find . -type f | xargs md5sum | sort) > $MNT_BASE/new.md5sums
+ (cd $MNT_OLD; find . -type f | xargs md5sum | sort) > $MNT_BASE/old.md5sums
+ diff $MNT_BASE/new.md5sums $MNT_BASE/old.md5sums
+ check_success "diff $MNT_BASE/new.md5sums $MNT_BASE/old.md5sums"
RES=$?
+ rm $MNT_BASE/new.md5sums $MNT_BASE/old.md5sums
umount $MNT_NEW
umount $MNT_OLD