commit:     42652771c0a17ae76bdbfc96130e681d52d7238c
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 22:28:23 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 22:28:23 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=42652771

Make sure CONTENTS is created in the right place

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/support/create-qcow2.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/targets/support/create-qcow2.sh b/targets/support/create-qcow2.sh
index 419e1c4e..8ab12b9a 100755
--- a/targets/support/create-qcow2.sh
+++ b/targets/support/create-qcow2.sh
@@ -91,10 +91,8 @@ cp -a "${clst_stage_path}"/* "${mymountpoint}/" || qcow2die 
"Could not copy cont
 # at this point we have a working system
 
 # create a CONTENTS.gz file
-pushd "${mymountpoint}" || qcow2die "Could not cd into mountpoint"
-find . > "${1}.CONTENTS" || qcow2die "Could not list files in mountpoint"
-popd || qcow2die "Could not cd out of mountpoint"
-gzip "${1}.CONTENTS" || qcow2die "Could not compress file list"
+# warning: $1 does not contain a full path
+( pushd "${mymountpoint}" &> /dev/null ; ls -laR ; popd &> /dev/null ) > 
"${1}.CONTENTS" || qcow2die "Could not create CONTENTS file"
 
 # note: the following must already have been done by the stage2:
 # - rudimentary configuration

Reply via email to