diff options
| author | Gatis Paeglis <gatis.paeglis@theqtcompany.com> | 2016-03-10 10:39:21 +0100 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@theqtcompany.com> | 2016-03-10 11:19:23 +0000 |
| commit | 4292abe1aefe47de54bee75ad7d44e0cf350e270 (patch) | |
| tree | 5b34033be8a5b2d3150724a7c996932a6b912571 /qt-ostree | |
| parent | b9ec86435a9858ca06d7cece17707c0bd313f17b (diff) | |
Remove --verbose command line arg
There isn't much use for it. When debugging "set -x"
is more desirable choice, it can be enabled via
QT_OSTREE_DEBUG envvar.
Change-Id: I81e743e0eecd54e8d8163f143bec20d312922b54
Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
Diffstat (limited to 'qt-ostree')
| -rwxr-xr-x | qt-ostree/qt-ostree | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/qt-ostree/qt-ostree b/qt-ostree/qt-ostree index 7479d77..3efa6b3 100755 --- a/qt-ostree/qt-ostree +++ b/qt-ostree/qt-ostree @@ -22,6 +22,7 @@ ############################################################################# if [ -n "${QT_OSTREE_DEBUG}" ] ; then set -x + VERBOSE="v" fi set -e shopt -s extglob @@ -37,7 +38,6 @@ OTA_SYSROOT=false START_HTTPD=false INVALID_ARGS=false BINARY_IMAGE=false -VERBOSE="" OS_NAME="qt-os" # HARDWARE INTEGRATION DEVICE="" @@ -153,7 +153,6 @@ usage() echo " date and time when the update was committed." echo echo "--create-initial-deployment Generates Over-The-Air Update ready sysroot." - echo "--verbose Prints more information to the console." echo "--start-trivial-httpd Starts a simple web server, hosting the OSTree repository (see --ostree-repo)." echo " The address to the hosted repository is listed in the httpd/httpd-address file in the working directory." echo @@ -250,9 +249,6 @@ parse_args() --start-trivial-httpd) START_HTTPD=true ;; - --verbose) - VERBOSE=v - ;; --ostree-repo) OSTREE_REPO=$(readlink -m ${2}) shift 1 @@ -661,6 +657,8 @@ create_initial_deployment() qt_ostree_info "Checking out filesystem tree from ${OSTREE_REPO} repository" ostree --repo=sysroot/ostree/repo pull-local --remote=${OS_NAME} ${OSTREE_REPO} ${OSTREE_BRANCH} + # --verbose here is not really that verbose, it simply helps to confirm that the correct + # boot loader backend was picked up by OSTree. ostree admin deploy --verbose ${KERNEL_ARGS} --os=${OS_NAME} ${OS_NAME}:${OSTREE_BRANCH} ostree admin status @@ -694,8 +692,8 @@ extract_sysroot() mkdir boot-mount rootfs-mount mount -o loop,offset=${boot_offset} ${image} boot-mount/ mount -o loop,offset=${rootfs_offset} ${image} rootfs-mount/ - cp -rd boot-mount/* ${BOOT_FILE_PATH} - cp -rd rootfs-mount/* ${GENERATED_TREE} + cp -r${VERBOSE}d boot-mount/* ${BOOT_FILE_PATH} + cp -r${VERBOSE}d rootfs-mount/* ${GENERATED_TREE} else # Extract *.tar.gz image files. for image in ${SYSROOT_IMAGE_PATH}/*.tar.gz ; do |