From 97e93fb177e5daa41d21d0fc7ac4c96c073da098 Mon Sep 17 00:00:00 2001
From: jandob
Date: Mon, 21 Mar 2016 17:46:30 +0100
Subject: remove genfstab dependency

---
 builder/dnbd3-rootfs/hooks/mount-root-device.sh | 6 +++++-
 builder/dnbd3-rootfs/module-setup.sh            | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'builder')

diff --git a/builder/dnbd3-rootfs/hooks/mount-root-device.sh b/builder/dnbd3-rootfs/hooks/mount-root-device.sh
index b7a7a80f..d78a209d 100755
--- a/builder/dnbd3-rootfs/hooks/mount-root-device.sh
+++ b/builder/dnbd3-rootfs/hooks/mount-root-device.sh
@@ -13,7 +13,11 @@ logging.set_level debug
 if ! getarg root=; then
     source "/etc/openslx"
     mount /dev/mapper/root "$NEWROOT" $SLX_MOUNT_ROOT_OPTIONS
-    genfstab "$NEWROOT" 2>/dev/null > "$NEWROOT/etc/fstab"
+    if [ -n "$SLX_GENERATE_FSTAB_SCRIPT" ]; then
+        eval "$SLX_GENERATE_FSTAB_SCRIPT"
+    else
+        echo "" > "$NEWROOT/etc/fstab"
+    fi
 fi
 }
 exceptions.catch
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 04d594dc..cecd9953 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -252,7 +252,6 @@ install() {
         cat cut \
         dd diff dirname dmsetup \
         find \
-        genfstab \
         grep \
         insmod \
         losetup lsblk \
-- 
cgit v1.2.3-55-g7522