Refactor utils lib.

1 files changed, 25 insertions, 2 deletions

diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 66d3e40c..df253bb7 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -1,9 +1,32 @@
 #!/bin/bash
 
+clean() {
+    source "$moddir/scripts/utils.sh"
+    source "$(dirname "${BASH_SOURCE[0]}")/scripts/rebash/core.sh"
+    core.import logging
+    core.import exceptions
+
+    exceptions.init
+
+    if [[ -f "$moddir/binaries/nbd/nbd.ko" ]]; then
+        utils_clean_nbd "$moddir/binaries/nbd/"
+    fi
+    if [[ -f "$moddir/binaries/dnbd3/build/dnbd3.ko" || ! -f "$moddir/binaries/dnbd3/build/dnbd3-client" ]]; then
+        utils_clean_dnbd3 "$moddir/binaries/dnbd3/"
+    fi
+    if [[ -f "$moddir/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker" ]]; then
+        utils_clean_systemd_preserve_process_marker \
+            "$moddir/binaries/systemd-preserve-process-marker/"
+    fi
+}
+
 check() {
     source "$moddir/scripts/utils.sh"
-    UTILS_STANDARD_OUTPUT=/dev/stdout
-    UTILS_ERROR_OUTPUT=/dev/stderr
+    source "$(dirname "${BASH_SOURCE[0]}")/scripts/rebash/core.sh"
+    core.import logging
+    core.import exceptions
+
+    exceptions.init
 
     if [[ ! -f "$moddir/binaries/nbd/nbd.ko" ]]; then
         utils_compile_nbd "$moddir/binaries/nbd/"