build-initramfs.sh: new-gen bootstrap

1 files changed, 8 insertions, 8 deletions

diff --git a/bootstrap/Ubuntu-18 b/bootstrap/Ubuntu-18
index 7f73db72..e8efbac8 100644
--- a/bootstrap/Ubuntu-18
+++ b/bootstrap/Ubuntu-18
@@ -1,19 +1,19 @@
-declare -A _core=(
+declare -A core_repo=(
   [handler]="git"
      [path]="systemd-init"
       [url]="git://git.openslx.org/openslx-ng/systemd-init.git"
    [branch]="downloader"
 )
 
-declare -A module_dracut=(
+declare -A core_dracut=(
   [handler]="http"
-     [path]="${_core[path]}/builder/dracut"
+     [path]="dracut"
       [url]="https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-047.tar.gz"
 )
 
 declare -A module_dnbd3=(
   [handler]="git"
-     [path]="${_core[path]}/builder/modules.d/dnbd3-rootfs/binaries/dnbd3"
+     [path]="${core_repo[path]}/modules.d/dnbd3-rootfs/binaries/dnbd3"
       [url]="git://git.openslx.org/dnbd3.git"
    [branch]="master"
    [commit]="c881c79"
@@ -21,7 +21,7 @@ declare -A module_dnbd3=(
 
 declare -A module_qemu_xmount=(
   [handler]="git"
-     [path]="${_core[path]}/builder/modules.d/dnbd3-rootfs/binaries/qemu-xmount"
+     [path]="${core_repo[path]}/modules.d/dnbd3-rootfs/binaries/qemu-xmount"
       [url]="git://github.com/eaas-framework/qemu.git"
    [branch]="libxmount_input"
    [commit]="4873cd023da8511ed9792a318d1456c949046123"
@@ -29,7 +29,7 @@ declare -A module_qemu_xmount=(
 
 declare -A module_xmount=(
   [handler]="git"
-     [path]="${_core[path]}/builder/modules.d/dnbd3-rootfs/binaries/xmount"
+     [path]="${core_repo[path]}/modules.d/dnbd3-rootfs/binaries/xmount"
       [url]="git://github.com/eaas-framework/xmount.git"
    [branch]="master"
    [commit]="0151375"
@@ -38,7 +38,7 @@ declare -A module_xmount=(
 declare -A module_kernel_qcow2_util_linux=(
   [handler]="git"
       [url]="git://git.openslx.org/openslx/kernel-qcow2-util-linux.git"
-     [path]="${_core[path]}/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-util-linux"
+     [path]="${core_repo[path]}/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-util-linux"
    [branch]="kernel-qcow2"
    [commit]="0692b96"
 )
@@ -46,7 +46,7 @@ declare -A module_kernel_qcow2_util_linux=(
 declare -A module_kernel_qcow2_linux=(
   [handler]="git"
       [url]="git://git.openslx.org/openslx/kernel-qcow2-linux.git"
-     [path]="${_core[path]}/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux"
+     [path]="${core_repo[path]}/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux"
    [branch]="kernel-qcow2-linux-4.19.y"
    [commit]="f9b4646"
 )