diff options
author | Thiago Abdo | 2019-11-04 12:21:55 +0100 |
---|---|---|
committer | Thiago Abdo | 2019-11-04 12:21:55 +0100 |
commit | 5e3fa459338acce9da194b72cf7e8f6a8dc9ee74 (patch) | |
tree | 2653572f026cbaadb8a34a83c433300e43704b29 | |
parent | Change sync branch to nobash (diff) | |
download | systemd-init-5e3fa459338acce9da194b72cf7e8f6a8dc9ee74.tar.gz systemd-init-5e3fa459338acce9da194b72cf7e8f6a8dc9ee74.tar.xz systemd-init-5e3fa459338acce9da194b72cf7e8f6a8dc9ee74.zip |
Removing extra loggings from rebash
Signed-off-by: Thiago Abdo <tjabdo@inf.ufpr.br>
-rwxr-xr-x | builder/build-initramfs.sh | 2 | ||||
-rw-r--r-- | builder/modules.d/dnbd3-rootfs/helper/build.inc | 34 | ||||
-rwxr-xr-x | dev-tools/exampleDracutModule/apply-package.sh | 6 |
3 files changed, 21 insertions, 21 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index 5f6baf54..b8599e43 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -309,7 +309,7 @@ main() { . "${_repo_dir}/builder/modules.d/dnbd3-rootfs/helper/build.inc" build_initialize_components if [[ "$initialize" == 'yes' ]]; then - logging.info "Initialized." + echo "Initialized." exit 0 fi echo 'Build initramfs.' diff --git a/builder/modules.d/dnbd3-rootfs/helper/build.inc b/builder/modules.d/dnbd3-rootfs/helper/build.inc index 2410c633..13ab9159 100644 --- a/builder/modules.d/dnbd3-rootfs/helper/build.inc +++ b/builder/modules.d/dnbd3-rootfs/helper/build.inc @@ -8,34 +8,34 @@ build_initialize_components() { local qcow_handler="$_QCOW_HANDLER" IFS='|' _pattern="^(${_supported_qcow_handlers[*]})$" export _pattern if [[ ! "$qcow_handler" =~ $_pattern ]] ; then - logging.warn "Unknown qcow handler '$qcow_handler' - will built all known." - logging.warn "Supported handlers: ${_supported_qcow_handlers[*]}" + echo "Unknown qcow handler '$qcow_handler' - will built all known." + echo "Supported handlers: ${_supported_qcow_handlers[*]}" fi _deps_base_dir="${_mainmoddir}/binaries" # We might want to move the "binaries" repos from the dnbd3-rootfs module to main repo one day... # TODO check for its existence using modinfo -k <kernel_version> if [[ ! -f "${_deps_base_dir}/dnbd3/build/dnbd3.ko" ]] || \ [[ ! -f "${_deps_base_dir}/dnbd3/build/dnbd3-client" ]]; then - logging.info "Could not find dnbd3, building it..." + echo "Could not find dnbd3, building it..." if ! CMAKE_FLAGS="-DKERNEL_DIR=${kernel_headers}" \ build_compile_dnbd3 "${_deps_base_dir}/dnbd3/"; then - logging.error "Failed to build dnbd3." + echo "Failed to build dnbd3." return 1 fi fi # take care of the qcow handler if [ -z "$qcow_handler" ] || [ "$qcow_handler" = "xmount" ]; then if [[ ! -f "${_deps_base_dir}/xmount/trunk/build/src/xmount" ]]; then - logging.info "Could not find xmount binary, building it..." + echo "Could not find xmount binary, building it..." if ! build_compile_xmount "${_deps_base_dir}/xmount/"; then - logging.error "Failed to build xmount binary." + echo "Failed to build xmount binary." return 1 fi fi if [[ ! -f "${_deps_base_dir}/qemu-xmount/libxmount_input_qemu.so" ]]; then - logging.info "Could not find xmount qemu library, building it..." + echo "Could not find xmount qemu library, building it..." if ! build_compile_qemu_xmount "${_deps_base_dir}/qemu-xmount/"; then - logging error "Failed to build xmount qemu library." + echo "Failed to build xmount qemu library." return 1 fi fi @@ -44,16 +44,16 @@ build_initialize_components() { if [ ! -f "${_deps_base_dir}/kernel-qcow2-linux/drivers/block/loop/loop.ko" ] \ || [ ! -f "${_deps_base_dir}/kernel-qcow2-linux/drivers/block/loop/loop_file_fmt_qcow.ko" ] \ || [ ! -f "${_deps_base_dir}/kernel-qcow2-linux/drivers/block/loop/loop_file_fmt_raw.ko" ]; then - logging.info "Could not find loop kernel modules, building them..." + echo "Could not find loop kernel modules, building them..." if ! build_compile_kernel_qcow "${_deps_base_dir}/kernel-qcow2-linux"; then - logging.error "Failed to build qcow loop kernel modules." + echo "Failed to build qcow loop kernel modules." return 1 fi fi if [ ! -f "${_deps_base_dir}/kernel-qcow2-util-linux/losetup" ]; then - logging.info "Could not find losetup with qcow2 support, building it..." + echo "Could not find losetup with qcow2 support, building it..." if ! build_compile_losetup_qcow "${_deps_base_dir}/kernel-qcow2-util-linux"; then - logging.error "Failed to build losetup with qcow support." + echo "Failed to build losetup with qcow support." return 1 fi fi @@ -61,14 +61,14 @@ build_initialize_components() { # always compile this helper since it does not cost much to do so if [[ ! -f "${_deps_base_dir}/systemd-preserve-process-marker/systemd-preserve-process-marker" ]]; then - logging.info "Could not find systemd-preserve-process-marker binary, building it ..." + echo "Could not find systemd-preserve-process-marker binary, building it ..." if ! build_compile_systemd_preserve_process_marker \ "${_deps_base_dir}/systemd-preserve-process-marker/"; then - logging.error "Failed to build systemd-preserve-process-marker" + echo "Failed to build systemd-preserve-process-marker" return 1 fi fi - logging.info "Compilation of dnbd3-rootfs dependencies succeeded." + echo "Compilation of dnbd3-rootfs dependencies succeeded." return 0 } @@ -204,7 +204,7 @@ build_compile_kernel_qcow() { pushd "$1" # https://lab.ks.uni-freiburg.de/projects/kernel-qcow2/wiki if [ -z "$kernel_headers" ]; then - logging.error "Kernel header directory not set, ignoring." + echo "Kernel header directory not set, ignoring." return 1 fi mkdir -p "${kernel_headers}/drivers/block/loop" @@ -231,7 +231,7 @@ build_compile_kernel_qcow() { } build_clean_kernel_qcow() { if [ -z "$kernel_headers" ]; then - logging.error "Kernel header directory not set, ignoring." + echo "Kernel header directory not set, ignoring." return 1 fi pushd "$kernel_headers" diff --git a/dev-tools/exampleDracutModule/apply-package.sh b/dev-tools/exampleDracutModule/apply-package.sh index 07d3c0a5..25a685b2 100755 --- a/dev-tools/exampleDracutModule/apply-package.sh +++ b/dev-tools/exampleDracutModule/apply-package.sh @@ -16,11 +16,11 @@ exceptions.try slx_server_base="$(getarg slxbase=)" exceptions.activate - logging.info 'Getting package.' + echo 'Getting package.' IFS_backup="$IFS" IFS=',' for host in ${slx_server}; do - logging.info "Trying host \"$host\"." + echo "Trying host \"$host\"." if wget --timeout 5 \ "http://${host}/${slx_server_base}config.tar.gz" \ --output-document - | tar --extract --verbose --gzip --directory \ @@ -33,6 +33,6 @@ exceptions.try } exceptions.catch { - logging.error "$exceptions_last_traceback" + echo "$exceptions_last_traceback" emergency_shell "error in ${BASH_SOURCE[0]}" } |