Merge disconnected ops branch.

[bootcd.git] / cdcustom.sh

diff --git a/cdcustom.sh b/cdcustom.sh
index e04196d..c77043b 100755 (executable)
--- a/cdcustom.sh
+++ b/cdcustom.sh
@@ -227,7 +227,7 @@ function main () {
    [[ -z "$@" ]] && usage
    ISO_GENERIC=$1; shift
 
-   if [ -z "$@" ] ; then
+   if [[ -z "$@" ]] ; then
      nodes="$DEFAULT_TARGET"
    else
      nodes="$@"
@@ -298,6 +298,22 @@ function main () {
      message "Refreshing isolinux.cfg"
      # Calculate ramdisk size (total uncompressed size of both archives)
 
+     ##########
+     # N.B. Thierry Parmentelat - 2006-06-28
+     # the order in which these images need to be mentioned here for
+     # isolinux involved some - not so educated - guesses
+     # as per syslinux source code in syslinux/runkernel.inc, the
+     # config file is parsed left to right, and indeed it's in that
+     # order that the files are loaded right off the CD
+     # This does not tell however, in case a given file is present in
+     # two different images - and that's the very purpose here - which
+     # one will take precedence over the other
+     # I came up with this order on a trial-and-error basis, I would
+     # have preferred to find it described somewhere
+     # Might be worth checking with other versions of syslinux in case
+     # the custom files would turn out to not be taken into account
+     ##########
+
      if [ -n "$CUSTOM_DIR" ] ; then
        images="bootcd.img custom.img overlay.img"
      else