diff options
| author | Andreas Loibl <andreas@andreas-loibl.de> | 2012-10-11 07:59:51 +0200 |
|---|---|---|
| committer | Andreas Loibl <andreas@andreas-loibl.de> | 2012-10-11 08:31:29 +0200 |
| commit | 48f3cfe728c1ffe44629c792380d4d47466ee38f (patch) | |
| tree | 537c2506f0b0c2a8006ba8ea983a24338effa335 /auto/functions/livebuild-hacks | |
| parent | 797ee5a8cf5bb066143582a7fb042285f2f220e3 (diff) | |
| download | kanotix-48f3cfe728c1ffe44629c792380d4d47466ee38f.zip kanotix-48f3cfe728c1ffe44629c792380d4d47466ee38f.tar.gz | |
compat update for latest live-build version
Diffstat (limited to 'auto/functions/livebuild-hacks')
| -rw-r--r-- | auto/functions/livebuild-hacks | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/auto/functions/livebuild-hacks b/auto/functions/livebuild-hacks index 6dd0cdc..3fc2fac 100644 --- a/auto/functions/livebuild-hacks +++ b/auto/functions/livebuild-hacks @@ -1,17 +1,16 @@ #!/bin/sh # Hacks to inject code into various live-build functions +current_script="$(basename "$0"|sed 's/^lb_//')" + # ISO sorting -if [ "$(basename "$0")" = "lb_binary_iso" ]; then +if [ "$current_script" = "binary_iso" ]; then echo "HOOK: livebuild-hacks@binary_iso" - In_list () + Genisoimage_options_hack () { - . "${LB_BASE}"/functions/aliases.sh - In_list "$@" - RC=$? if [ -f config/binary_iso/isoimage.sort ] then - GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -sort isoimage.sort" + echo " -sort isoimage.sort" case "${LB_BUILD_WITH_CHROOT}" in true) @@ -23,17 +22,38 @@ if [ "$(basename "$0")" = "lb_binary_iso" ]; then ;; esac fi + Genisoimage_options_hack () { true; } # only once -> overload + } + In_list () + { + . "${LB_BASE}"/functions/aliases.sh + In_list "$@" + RC=$? + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS}$(Genisoimage_options_hack)" case "$LB_BOOTLOADER" in grub2|burg) LB_BINARY_IMAGES=iso ;; esac - return $rc + return $RC + } + Install_package () + { + . "${LB_BASE}"/functions/packages.sh + Install_package "$@" + RC=$? + LB_ISO_APPLICATION="${LB_ISO_APPLICATION}\"$(Genisoimage_options_hack)\"" + case "$LB_BOOTLOADER" in + grub2|burg) + LB_BINARY_IMAGES=iso + ;; + esac + return $RC } fi # Grub2: Do not number the default kernel / initrd files. -if [ "$(basename "$0")" = "lb_binary_grub2" ]; then +if [ "$current_script" = "binary_grub2" ]; then echo "HOOK: livebuild-hacks@binary_grub2" Overload_Grub_live_entry () { |