Maybe we can extract the common part of qcow2rootfs and docker2rootfs as a public lib function later.

-------- Thanks Yu Chuan

On Wed, Jan 13, 2021 at 05:13:09PM +0800, Wang Chenglong wrote:

[Why] Sometimes, the kernel is in vmlinux format and needs to be unpacked into vmlinuz format.

Signeo-off-by: Wang Chenglong 18509160991@163.com

container/docker2rootfs/common | 57 ++++++++++++++++++++++++++++- container/docker2rootfs/run | 1 + container/docker2rootfs/setup-image | 2 +- 3 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/container/docker2rootfs/common b/container/docker2rootfs/common index c26bbc8..91d53e7 100755 --- a/container/docker2rootfs/common +++ b/container/docker2rootfs/common @@ -133,7 +133,7 @@ get_rootfs_kernel()

local vmlinuz_file local vmlinuz kernel

• vmlinuz_file=$(find ./boot -name "vmlinuz-*" | grep -v rescue) && export ROOTFS_VMLINUZ_FILE=$vmlinuz_file

• vmlinuz_file=$(find ./boot -name "vmlinu[z|x]-*" | grep -v rescue) && export ROOTFS_VMLINUZ_FILE=$vmlinuz_file vmlinuz=$(basename "$vmlinuz_file") && export ROOTFS_VMLINUZ=$vmlinuz kernel=${vmlinuz:8} && export ROOTFS_KERNEL=$kernel

@@ -155,3 +155,58 @@ create_links_vmlinuz_initrd()

echo "[INFO] Create links to initrd.lkp and vmlinuz success!" }

+get_vmlinuz_start_postion() {

•    local vmlinuz=$1
  

•    local vmlinuz_start_line
  

•    local vmlinuz_start_postion
  

•    # '1f 8b 08' - https://www.filesignatures.net/index.php?page=search&search=1F8B08&mode=SIG
  

•    vmlinuz_start_line=$(od -A d -t x1 ${vmlinuz} | grep "1f 8b 08")
  

•    vmlinuz_start_postion=${vmlinuz_start_line%% *}
  

•    [ -z ${vmlinuz_start_postion} ] && {
  

•            echo "[WARNING] identify vmlinuz failed."
  

•            export VMLINUZ_START_POSTION=-1
  

•            return
  

•    }
  

•    [ X${vmlinuz_start_postion} == X0000000 ] || {
  

•            local vmlinuz_start_postion_tmp
  

•            vmlinuz_start_postion_tmp=$(echo ${vmlinuz_start_line} | awk '{for(i=1;i<=NF;i++)if($i=="1f")print i-1}')
  

•            vmlinuz_start_postion=$((${vmlinuz_start_postion} + ${vmlinuz_start_postion_tmp} -1))
  

•    }
  

•    export VMLINUZ_START_POSTION=${vmlinuz_start_postion}
  

+}

+unzip_vmlinuz() {

•    get_rootfs_kernel
  

•    file ${ROOTFS_VMLINUZ_FILE} | grep -q gzip || return
  

•    get_vmlinuz_start_postion ${ROOTFS_VMLINUZ_FILE}
  

•    [ $VMLINUZ_START_POSTION -eq -1 ] && return
  

•    local unzip_str
  

•    if [ $VMLINUZ_START_POSTION -eq 0 ]; then
  

•            unzip_str="dd if=$ROOTFS_VMLINUZ bs=1 | zcat > $ROOTFS_VMLINUZ.tmp"
  

•    else
  

•            unzip_str="dd if=$ROOTFS_VMLINUZ bs=1 skip=$VMLINUZ_START_POSTION | zcat > $ROOTFS_VMLINUZ.tmp"
  

•    fi
  

•    echo "Unzipping vmlinuz..."
  

•    local cmds
  

•    cmds=(
  

• cd $ROOTFS_DIR/boot
  

• $unzip_str
  

• mv $ROOTFS_VMLINUZ.tmp $ROOTFS_VMLINUZ
  

• chmod o+r $ROOTFS_VMLINUZ
  

•    )
  

•    if "${cmds[@]}" ; then
  

•            echo "[INFO] Unzipping vmlinuz success!"
  

•    else
  

•            echo "[WARNING] Unzipping vmlinuz failed!"
  

•    fi
  

+} diff --git a/container/docker2rootfs/run b/container/docker2rootfs/run index 8a7b315..cdb19bf 100755 --- a/container/docker2rootfs/run +++ b/container/docker2rootfs/run @@ -31,3 +31,4 @@ start=( cp_rootfs $IMAGE_PACK $2 docker rm -f rootfs-docker create_links_vmlinuz_initrd $2 +unzip_vmlinuz diff --git a/container/docker2rootfs/setup-image b/container/docker2rootfs/setup-image index ffe4937..47bfb7e 100755 --- a/container/docker2rootfs/setup-image +++ b/container/docker2rootfs/setup-image @@ -38,7 +38,7 @@ setup_login() pack_cgz() { echo "Packing package. Please wait."

• find ./ ! -path "./tmp/${IMAGE_PACK}" | cpio -o -Hnewc | gzip -9 >./tmp/$IMAGE_PACK

• find ./ ! -path "./tmp/$IMAGE_PACK" | cpio -o -Hnewc | gzip -9 > "./tmp/$IMAGE_PACK" chmod 644 /tmp/${IMAGE_PACK}

}

-- 2.23.0