diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2017-11-20 22:20:47 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2017-11-20 22:20:53 +0100 |
| commit | 9f3e5fe8d968f79fbd1f4c60fb6b020758fe8510 (patch) | |
| tree | 5b71be7b53e0939a06728e2f8b9bf5a9713d0cd7 | |
| parent | dae94463e4c2df83e6a31d58b82c6502f70190a1 (diff) | |
| download | vyos-live-build-9f3e5fe8d968f79fbd1f4c60fb6b020758fe8510.tar.gz vyos-live-build-9f3e5fe8d968f79fbd1f4c60fb6b020758fe8510.zip | |
Fix the way the .disk/mkisofs file is created
Thanks to Daniel Reichelt <debian@nachtgeist.net> for the patch.
Closes: #881941
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | scripts/build/binary_iso | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 7f948990a..07720ddd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ live-build (1:20170921) UNRELEASED; urgency=medium Thanks to Chris Lamb <lamby@debian.org> for the patch. * Accept kernels without initrd. Closes: #878430 Thanks to Balint Reczey <balint.reczey@canonical.com> for the patch. + * Fix the way the .disk/mkisofs file is created. Closes: #881941 + Thanks to Daniel Reichelt <debian@nachtgeist.net> for the patch. -- Raphaël Hertzog <hertzog@debian.org> Mon, 20 Nov 2017 22:02:22 +0100 diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index 6ddb9dd09..1ca460c02 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -214,7 +214,11 @@ fi cat >> binary.sh << EOF mkdir -p binary/.disk -echo "xorriso -as mkisofs ${XORRISO_OPTIONS} -o ${IMAGE} binary" > binary/.disk/mkisofs +xorriso -as mkisofs ${XORRISO_OPTIONS} -o ${IMAGE} binary +EOF + +# retain the xorriso command used to create the image in the image itself +cat <<-EOF >binary/.disk/mkisofs xorriso -as mkisofs ${XORRISO_OPTIONS} -o ${IMAGE} binary EOF |