From 35fbc121465119f572e19d13fe915f02c1f1fa20 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 9 Jan 2019 13:06:06 +0100
Subject: [dnbd3-rfs] remove deprecated script

device-add-write-layer.sh is replaced by slx-partitioner module
---
 builder/modules.d/dnbd3-rootfs/module-setup.sh     |  5 +++--
 .../dnbd3-rootfs/scripts/device-add-write-layer.sh | 26 ----------------------
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100755 builder/modules.d/dnbd3-rootfs/scripts/device-add-write-layer.sh

diff --git a/builder/modules.d/dnbd3-rootfs/module-setup.sh b/builder/modules.d/dnbd3-rootfs/module-setup.sh
index f956af3c..26678194 100755
--- a/builder/modules.d/dnbd3-rootfs/module-setup.sh
+++ b/builder/modules.d/dnbd3-rootfs/module-setup.sh
@@ -180,8 +180,9 @@ install() {
     inst "$moddir/binaries/dnbd3/build/dnbd3-client" /usr/bin/dnbd3-client
     inst "$moddir/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker" \
         /usr/bin/systemd-preserve-process-marker
-    inst "$moddir/scripts/device-add-write-layer.sh" \
-        /usr/bin/device-add-write-layer
+    ## DEPRECATED
+    #inst "$moddir/scripts/device-add-write-layer.sh" \
+    #    /usr/bin/device-add-write-layer
     inst "$moddir/scripts/container-unpack-xmount.sh" \
         /usr/bin/container-unpack-xmount
     inst "$moddir/scripts/container-unpack-qemu.sh" \
diff --git a/builder/modules.d/dnbd3-rootfs/scripts/device-add-write-layer.sh b/builder/modules.d/dnbd3-rootfs/scripts/device-add-write-layer.sh
deleted file mode 100755
index 2e4116a7..00000000
--- a/builder/modules.d/dnbd3-rootfs/scripts/device-add-write-layer.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-# -*- coding: utf-8 -*-
-# region imports
-# shellcheck source=./rebash/core.sh
-source "/usr/lib/rebash/core.sh"
-core.import exceptions
-exceptions.activate
-# endregion
-
-combined_device_name="$1"
-read_only_device="$2"
-writable_device="$3"
-persistent="$4" # P or N
-chunksize='1'
-
-partition_size="$(blockdev --getsz "$read_only_device")"
-writable_partition_name='root'
-modprobe dm_snapshot
-dmsetup create "$combined_device_name" --noudevsync --table \
-    "0 $partition_size snapshot $read_only_device $writable_device $persistent $chunksize"
-dmsetup mknodes --noudevsync "$combined_device_name"
-
-# region vim modline
-# vim: set tabstop=4 shiftwidth=4 expandtab:
-# vim: foldmethod=marker foldmarker=region,endregion:
-# endregion
-- 
cgit v1.2.3-55-g7522