Improve initial repo retrieving.

2 files changed, 5 insertions, 8 deletions

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 49698bff..c60586c8 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -33,12 +33,9 @@ if ! [[ -d "$_needed_location" ]]; then
         echo "Needed dependency \"git\" isn't available. Please install \"git\" or provide the repositories data structure in \"$(dirname "${BASH_SOURCE[0]}")\"."
     fi
     _temporary_repository_location="$(mktemp --directory)"
-    git clone git://git.openslx.org/openslx-ng/systemd-init.git \
+    git clone --recursive --depth 1 \
+        git://git.openslx.org/openslx-ng/systemd-init.git \
         "$_temporary_repository_location"
-    pushd "$_temporary_repository_location"
-    git submodule init
-    git submodule update
-    popd
     cp --recursive \
         "${_temporary_repository_location}/builder/dnbd3-rootfs" \
         "$_needed_location"
diff --git a/builder/dnbd3-rootfs/scripts/build.sh b/builder/dnbd3-rootfs/scripts/build.sh
index bd0c75b2..10e9c71e 100644
--- a/builder/dnbd3-rootfs/scripts/build.sh
+++ b/builder/dnbd3-rootfs/scripts/build.sh
@@ -39,7 +39,7 @@ build_compile_xmount() {
     local install_prefix="/"
     [ ! -z "$3" ] && install_prefix="$3"
 
-    mkdir -p trunk/build
+    mkdir --parents trunk/build
     cd trunk/build
     cmake -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX="$install_prefix" ..
@@ -50,11 +50,11 @@ build_compile_xmount() {
     return $ret
 }
 build_clean_xmount() {
-    rm -rf "$1/trunk/build"
+    rm --recursive --force "$1/trunk/build"
 }
 build_clean_qemu_nbd() {
     pushd "$1"
-    git clean -f -x || make clean
+    git clean --force -x || make clean
     popd
     return $?
 }