diff options
| author | jandob | 2016-02-09 13:30:32 +0100 |
|---|---|---|
| committer | jandob | 2016-02-09 13:30:32 +0100 |
| commit | ee5fbca85eb4ef2d57882809b24c3355d0a35492 (patch) | |
| tree | 5536b29274cb59fefe686286068449941585b85d | |
| parent | Sync. (diff) | |
| download | systemd-init-ee5fbca85eb4ef2d57882809b24c3355d0a35492.tar.gz systemd-init-ee5fbca85eb4ef2d57882809b24c3355d0a35492.tar.xz systemd-init-ee5fbca85eb4ef2d57882809b24c3355d0a35492.zip | |
fix submodule checkout
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rwxr-xr-x | builder/build-initramfs.sh | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index 6cb1f5e1..a012df3d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ -[submodule "builder/dnbd3-rootfs/scripts/rebash"] +[submodule "rebash"] path = builder/dnbd3-rootfs/scripts/rebash url = git://github.com/jandob/rebash.git branch = master @@ -6,11 +6,11 @@ path = builder/dnbd3-rootfs/binaries/dnbd3 url = git://git.openslx.org/dnbd3.git branch = master -[submodule "builder/dnbd3-rootfs/binaries/xmount"] +[submodule "xmount"] path = builder/dnbd3-rootfs/binaries/xmount url = https://github.com/eaas-framework/xmount.git branch = master -[submodule "builder/dnbd3-rootfs/binaries/qemu-xmount"] +[submodule "qemu-xmount"] path = builder/dnbd3-rootfs/binaries/qemu-xmount url = https://github.com/eaas-framework/qemu branch = libxmount_input diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index 6a956a7f..2b0f9765 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -37,7 +37,12 @@ if ! [[ -d "$_needed_location" ]]; then git://git.openslx.org/openslx-ng/systemd-init.git \ "$_temporary_repository_location" pushd "$_temporary_repository_location" - git submodule update --init --remote --depth 1 + git submodule init + git submodule foreach ' + branch="$(git config -f $toplevel/.gitmodules submodule.$name.branch)" + git clone --depth 1 --branch $branch + ' + git submodule update --remote popd cp --recursive \ "${_temporary_repository_location}/builder/dnbd3-rootfs" \ |