From: Michael Prokop <mika@grml.org>
Date: Fri, 17 Jul 2020 19:57:46 +0000 (+0200)
Subject: Support usage of boot/addons via symlink to corresponding git repository
X-Git-Tag: v0.37.0~7
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=7430221d82755bc912787c70a5b298b79ace937f

Support usage of boot/addons via symlink to corresponding git repository

It's annoying when you are running grml-live from the git repository,
as the installed grml-live-addons package doesn't matter then,
because the templates are pointing to the git repository.
This can be handled via a symlink, support its usage and mention
it in the docs.
---

diff --git a/README.md b/README.md
index 12d6a91..218b1bb 100644
--- a/README.md
+++ b/README.md
@@ -25,4 +25,5 @@ of an installed `grml-live` package:
     # export SCRIPTS_DIRECTORY=$(pwd)/scripts
     # export LIVE_CONF=$(pwd)/etc/grml/grml-live.conf
     # export TEMPLATE_DIRECTORY=$(pwd)/templates
+    # ln -s ../../../grml-live-grml/templates/boot/addons templates/boot/  # optional
     # ./grml-live -s sid -a amd64 -c GRMLBASE,GRML_FULL,AMD64
diff --git a/grml-live b/grml-live
index 5cd5880..52132d0 100755
--- a/grml-live
+++ b/grml-live
@@ -1123,7 +1123,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
       log   "Skipping installation of boot addons as requested via \$NO_ADDONS."
       einfo "Skipping installation of boot addons as requested via \$NO_ADDONS."; eend 0
     else
-      if ! [ -d "$TEMPLATE_DIRECTORY"/boot/addons ] ; then
+      if ! [ -r "$TEMPLATE_DIRECTORY"/boot/addons ] ; then
         log   "Boot addons not found, skipping therefore. (Consider installing package grml-live-addons)"
         ewarn "Boot addons not found, skipping therefore. (Consider installing package grml-live-addons)" ; eend 0
       else