diff options
| author | jandob | 2016-03-11 11:59:25 +0100 |
|---|---|---|
| committer | jandob | 2016-03-11 11:59:25 +0100 |
| commit | 0bc20d23f2178f5c4059e73940f69570de6f2b32 (patch) | |
| tree | fe8b5eae18fd1b780eaf18f6c6d27bd4c14b271e | |
| parent | rebash update (diff) | |
| parent | update (diff) | |
| download | systemd-init-0bc20d23f2178f5c4059e73940f69570de6f2b32.tar.gz systemd-init-0bc20d23f2178f5c4059e73940f69570de6f2b32.tar.xz systemd-init-0bc20d23f2178f5c4059e73940f69570de6f2b32.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init
| -rwxr-xr-x | builder/build-initramfs.sh | 1 | ||||
| -rw-r--r-- | builder/dnbd3-rootfs/scripts/build.sh | 1 | ||||
| -rw-r--r-- | builder/dnbd3-rootfs/scripts/tools.sh | 2 | ||||
| -rw-r--r-- | builder/readme.md (renamed from builder/INSTALL) | 2 | ||||
| -rw-r--r-- | readme.md | 1 |
5 files changed, 4 insertions, 3 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index 6579f4d8..7b01bfc5 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -582,6 +582,7 @@ main() { exceptions.deactivate } # endregion +core.is_main && main "$@" # region vim modline # vim: set tabstop=4 shiftwidth=4 expandtab: # vim: foldmethod=marker foldmarker=region,endregion: diff --git a/builder/dnbd3-rootfs/scripts/build.sh b/builder/dnbd3-rootfs/scripts/build.sh index 6066e721..47e5dcc7 100644 --- a/builder/dnbd3-rootfs/scripts/build.sh +++ b/builder/dnbd3-rootfs/scripts/build.sh @@ -81,7 +81,6 @@ build_compile_dnbd3() { Examples: `build_compile_dnbd3 path/to/dnbd3/source/` - ' pushd "$1" # NOTE: The generic way would be: "./build.sh" but this tries to build diff --git a/builder/dnbd3-rootfs/scripts/tools.sh b/builder/dnbd3-rootfs/scripts/tools.sh index c6c2966a..4831ce42 100644 --- a/builder/dnbd3-rootfs/scripts/tools.sh +++ b/builder/dnbd3-rootfs/scripts/tools.sh @@ -50,7 +50,7 @@ tools_find_block_device() { local partition_pattern="$1" local device="$2" - [ "$partition_pattern" = "" ] && return 1 + [ "$partition_pattern" = '' ] && return 1 tools_find_block_device_simple() { local device_info lsblk --noheadings --list --paths --output \ diff --git a/builder/INSTALL b/builder/readme.md index 223d8942..113d30c2 100644 --- a/builder/INSTALL +++ b/builder/readme.md @@ -17,3 +17,5 @@ the initramfs with the following command: Note that the '--no-hostonly' is critical if the machine dracut is executed on and the clients supposed to boot the resulting initramfs differ. + +For more informations see: https://lab.ks.uni-freiburg.de/projects/dracut-praktikum/wiki diff --git a/readme.md b/readme.md deleted file mode 100644 index 138fb503..00000000 --- a/readme.md +++ /dev/null @@ -1 +0,0 @@ -Siehe: https://lab.ks.uni-freiburg.de/projects/dracut-praktikum/wiki |