[Git-commits] terminalserver for grml branch, master, updated. v0.99.11-4-gbad00fc

[git repository hosting]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "terminalserver for grml".

The branch, master has been updated
       via  bad00fc6a58406f1e110bf9e5701ff6eee6c3a3b (commit)
       via  9ac385407456701cb4935b88159095e133578053 (commit)
       via  162ecbe01f6e8c085bb5e9b6f0bdbe2d27e659aa (commit)
       via  fdea9e5736375443ad3818136cab0bc41f9d9414 (commit)
      from  0477e926a3886e62258244e86265915aaa2f449a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bad00fc6a58406f1e110bf9e5701ff6eee6c3a3b
Merge: 0477e926a3886e62258244e86265915aaa2f449a 9ac385407456701cb4935b88159095e133578053
Author: Michael Gebetsroither <michael at mgeb.org>
Date:   Thu Dec 2 17:23:52 2010 +0100

    Merge remote branch 'origin/mru/issue733'
    
    Signed-off-by: Michael Gebetsroither <michael at mgeb.org>

commit 9ac385407456701cb4935b88159095e133578053
Author: Ulrich Dangel <mru at grml.org>
Date:   Sun Nov 7 22:44:25 2010 +0100

    Adjust live-media-path if /live/image is not the bootmedium

commit 162ecbe01f6e8c085bb5e9b6f0bdbe2d27e659aa
Author: Ulrich Dangel <mru at grml.org>
Date:   Sun Nov 7 22:18:47 2010 +0100

    Use config files instead of globbing, adjust indention

commit fdea9e5736375443ad3818136cab0bc41f9d9414
Author: Ulrich Dangel <mru at grml.org>
Date:   Sun Nov 7 22:15:27 2010 +0100

    Support grml-terminalserver from no boot medium present. [Closes: issue733]
    
    Added fallback for kernel location to /boot. Always use initrd from /boot.
    Copy syslinux config from grml-live template directory if no syslinux config is present.
    Explicit set fsid to support {ram,tmp}fs.

-----------------------------------------------------------------------

Summary of changes:
 default_config                 |    7 ++++
 grml-terminalserver            |    8 ++--
 grml-terminalserver-config     |   10 +----
 templates/grub-pxelinux_config |   74 ++++++++++++++++++++++++++++++----------
 4 files changed, 69 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
terminalserver for grml