Commit 27d10e21 authored by Daniel Bissani Furlin's avatar Daniel Bissani Furlin
Browse files

Merge branch 'issue/585' into 'develop'

SCRUM#585: Remove unused code

See merge request !15
parents 1be8fa16 27d1be49
Pipeline #17183 passed with stage
in 12 seconds
...@@ -51,27 +51,21 @@ version="$(basename "${initrd_path}" | cut --delimiter='-' --fields=2,3)" ...@@ -51,27 +51,21 @@ version="$(basename "${initrd_path}" | cut --delimiter='-' --fields=2,3)"
cp "${CHROOTDIR}/boot/vmlinuz-${version}-generic" "${TMP}/image/casper/vmlinuz" || createIsoLogger --message "Unable to copy kernel to image" --tag "cp" cp "${CHROOTDIR}/boot/vmlinuz-${version}-generic" "${TMP}/image/casper/vmlinuz" || createIsoLogger --message "Unable to copy kernel to image" --tag "cp"
# The initrd is converted from gzip to lzma # The initrd is converted from gzip to lzma
if ! test -f initrd.lz; then createIsoLogger --message "Using '$(basename "${initrd_path}")'" --type info
if [ ! -d "${PREFIX}/initrd" ]; then initrd_type="$(file "${initrd_path}")"
mkdir "${PREFIX}/initrd" mkdir "${PREFIX}/initrd"
else pushd "${PREFIX}/initrd" || createIsoLogger --message "Unable to change directory" --tag "pushd"
rm --recursive --force "${PREFIX:?}"/initrd/* if grep --quiet --ignore-case "gzip" <<< "${initrd_type}"; then
fi gzip --decompress --stdout "${initrd_path}" | cpio --extract || createIsoLogger --message "Unable to decompress initrd" --tag "gzip"
createIsoLogger --message "Using '$(basename "${initrd_path}")'" --type info elif grep --quiet --ignore-case "ascii" <<< "${initrd_type}"; then
initrd_type="$(file "${initrd_path}")" block_size="$(binwalk --include="compressed data" "${initrd_path}" | cut --delimiter=" " --fields=1 | grep -E "[0-9]+")"
pushd "${PREFIX}/initrd" || createIsoLogger --message "Unable to change directory" --tag "pushd" dd if="${initrd_path}" bs="${block_size}" skip=1 | gunzip | cpio --extract --make-directories
if grep --quiet --ignore-case "gzip" <<< "${initrd_type}"; then else
gzip --decompress --stdout "${initrd_path}" | cpio --extract || createIsoLogger --message "Unable to decompress initrd" --tag "gzip" createIsoLogger --message "Invalid initrd format"
elif grep --quiet --ignore-case "ascii" <<< "${initrd_type}"; then
block_size="$(binwalk --include="compressed data" "${initrd_path}" | cut --delimiter=" " --fields=1 | grep -E "[0-9]+")"
dd if="${initrd_path}" bs="${block_size}" skip=1 | gunzip | cpio --extract --make-directories
else
createIsoLogger --message "Invalid initrd format"
fi
find . | cpio --quiet --create -H newc | lzma -7 > ../initrd.lz || createIsoLogger --message "Unable to compress initrd" --tag "lzma"
popd || createIsoLogger --message "Unable to change directory" --tag "popd"
rm --recursive --force "${PREFIX:?}/initrd"
fi fi
find . | cpio --quiet --create -H newc | lzma -7 > ../initrd.lz || createIsoLogger --message "Unable to compress initrd" --tag "lzma"
popd || createIsoLogger --message "Unable to change directory" --tag "popd"
rm --recursive --force "${PREFIX:?}/initrd" || createIsoLogger --message "Unable to remove dir \"${PREFIX}/initrd\"" --tag "rm"
mv initrd.lz "${TMP}/image/casper/initrd.lz" || createIsoLogger --message "Unable to move initrd to image" --tag "mv" mv initrd.lz "${TMP}/image/casper/initrd.lz" || createIsoLogger --message "Unable to move initrd to image" --tag "mv"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment