From b365d3c83360ec1e3fe7bd9fd258a6e08e42f13c Mon Sep 17 00:00:00 2001 From: Andreas Florath Date: Thu, 2 Jun 2016 21:02:49 +0200 Subject: [PATCH] Refactor: remove unused functions There were a couple of functions which were unused: ensure_nbd, map_nbd, unmount_qcow_image, mount_qcow_image, ensure_sudo Because some of them use 'trap ... EXIT' this hinders introducing a separate exit phase - therefore they are removed. (It would also be impossible to use them in the current setup, because they overwrite the 'trap ... EXIT' of the disk-image-creates 'main'.) Change-Id: If932a557dca9aea4864154ad6c4f286373d6dd7c Signed-off-by: Andreas Florath --- lib/common-functions | 51 -------------------------------------------- lib/img-functions | 15 ------------- 2 files changed, 66 deletions(-) diff --git a/lib/common-functions b/lib/common-functions index 97305d602..a5929adf0 100644 --- a/lib/common-functions +++ b/lib/common-functions @@ -124,57 +124,6 @@ function eval_run_d () { trap - ERR } -# Usage: map_nbd $image -# Returns nbd device path -function map_nbd { - (lsmod | grep '^nbd ' >/dev/null) || sudo modprobe nbd max_part=16 - - if [[ $(qemu-nbd --help | grep cache) == *writeback* ]] ; then - CACHE="--cache=writeback" - else - echo "Warning: qemu-nbd without --cache=writeback is /slow/." - CACHE="" - fi - NBD_DEV= - for i in `seq 0 15`; do - if [ ! -e /sys/block/nbd$i/pid ]; then - NBD_DEV=/dev/nbd$i - # Connect to nbd and wait till it is ready - sudo qemu-nbd -c $NBD_DEV $CACHE $1 - if ! timeout 60 sh -c "while ! [ -e /sys/block/nbd$i/pid ]; do sleep 1; done"; then - echo "Couldn't connect $NBD_DEV" - exit 1 - fi - break - fi - done - if [ -z "$NBD_DEV" ]; then - echo "No free NBD slots" - exit 1 - fi -} - -# Delete and unmount the working dir used in extracting kernel/initrd -function unmount_qcow_image () { - sudo umount $WORK_DIR || true - sudo qemu-nbd -d $NBD_DEV >/dev/null || true - sudo rm -rf $WORK_DIR - - trap - SIGHUP SIGINT SIGTERM EXIT -} - -function mount_qcow_image() { - trap unmount_qcow_image SIGHUP SIGINT SIGTERM EXIT - - WORK_DIR=$(mktemp -d) - map_nbd $1 - if [ -e "${NBD_DEV}p1" ]; then - sudo mount ${NBD_DEV}p1 $WORK_DIR - else - sudo mount ${NBD_DEV} $WORK_DIR - fi -} - function cleanup_build_dir () { if ! timeout 5 sh -c " while ! sudo rm -rf $TMP_BUILD_DIR/built; do sleep 1; done"; then echo "ERROR: unable to cleanly remove $TMP_BUILD_DIR/built" diff --git a/lib/img-functions b/lib/img-functions index 908123ce9..beb3ac88b 100644 --- a/lib/img-functions +++ b/lib/img-functions @@ -52,21 +52,6 @@ function cleanup () { cleanup_image_dir } -function ensure_nbd () { - NBD=`which qemu-nbd` || true - if [ -z "$NBD" ]; then - echo "qemu-nbd is not found in your PATH" - echo "Please install it on your system" - exit 1 - fi - # prep nbd for mounting - (lsmod | grep '^nbd ' >/dev/null) || sudo modprobe nbd max_part=16 -} - -function ensure_sudo () { - sudo echo "Ensuring sudo is available" -} - # Helper function to run a command inside the chroot function run_in_target () { cmd="$@"