From: Chris Hofstaedtler <christian@hofstaedtler.name>
Date: Wed, 25 Jul 2018 18:34:24 +0000 (+0200)
Subject: Simplify module loading
X-Git-Tag: v0.83~3^2
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=fc0a6d8c09bd56cdd17ef2586c45a919356fbd88

Simplify module loading

This works fine on stretch.
---

diff --git a/grml-debootstrap b/grml-debootstrap
index eafb2c1..96f4a45 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -1388,30 +1388,18 @@ prepare_vm() {
   fi
 
   # make sure loop module is present and an usable loop device exists
+  modprobe -q loop
   if ! losetup -f >/dev/null 2>&1; then
-    einfo "Can not find a usable loop device, retrying after loading loop module."
-    if ! modprobe loop > /dev/null 2>&1; then
-      eerror "Error loading loop module" ; eend 1
-      bailout 1
-    fi
-    eend $?
-    if losetup -f >/dev/null 2>&1; then
-      einfo "Found a usable loop device now, continuing."
-    else
-      eerror "Error finding usable loop device" ; eend 1
-      bailout 1
-    fi
+    eerror "Error finding usable loop device" ; eend 1
+    bailout 1
   fi
 
   # if dm-mod isn't available then kpartx will fail with
   # "Is device-mapper driver missing from kernel? [...]"
+  modprobe -q dm-mod
   if ! grep -q 'device-mapper' /proc/misc >/dev/null 2>&1 ; then
-    einfo "Device-mapper not ready yet, trying to load dm-mod module."
-    if ! modprobe dm-mod > /dev/null 2>&1; then
-      eerror "Error loading dm-mod module" ; eend 1
-      bailout 1
-    fi
-    eend $?
+    einfo "Device-mapper support missing in kernel."
+    bailout 1
   fi
 
   ORIG_TARGET="$TARGET" # store for later reuse