From 978a3acd5c7e4dfe4ffdb23c81fd507f3edfccd4 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 13 May 2020 13:44:18 +0200
Subject: build-initramfs.sh: new-gen bootstrap

---
 bootstrap/CentOS-7 | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'bootstrap/CentOS-7')

diff --git a/bootstrap/CentOS-7 b/bootstrap/CentOS-7
index 19f9f0b2..5d19e4b9 100644
--- a/bootstrap/CentOS-7
+++ b/bootstrap/CentOS-7
@@ -1,5 +1,4 @@
-
-declare -A _core=(
+declare -A core_repo=(
   [handler]="git"
      [path]="systemd-init"
       [url]="git://git.openslx.org/openslx-ng/systemd-init.git"
@@ -7,15 +6,15 @@ declare -A _core=(
    [commit]="c63e555a86"
 )
 
-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"
@@ -23,7 +22,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"
@@ -31,7 +30,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"
@@ -40,7 +39,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"
 )
@@ -48,7 +47,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"
 )
@@ -56,7 +55,7 @@ declare -A module_kernel_qcow2_linux=(
 declare -A module_rebash=(
   [handler]="git"
       [url]="https://github.com/jandob/rebash.git"
-     [path]="${_core[path]}/builder/modules.d/dnbd3-rootfs/scripts/rebash"
+     [path]="${core_repo[path]}/modules.d/dnbd3-rootfs/scripts/rebash"
    [branch]="master"
    [commit]="6ca5b39"
 )
-- 
cgit v1.2.3-55-g7522