From: Ulrich Dangel <uli@spamt.net>
Date: Tue, 27 Oct 2009 20:33:46 +0000 (+0100)
Subject: Dynamic check for addons as grml-small is nowadays shipped with addons.
X-Git-Tag: v0.9.16~1
X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=85933b53da2988f8fe263062fe4dbbfd83a211ff

Dynamic check for addons as grml-small is nowadays shipped with addons.
---

diff --git a/grml2usb b/grml2usb
index 06a8f8a..6455aac 100755
--- a/grml2usb
+++ b/grml2usb
@@ -1222,8 +1222,8 @@ def install_iso_files(grml_flavour, iso_mount, device, target):
             sys.exit(1)
 
     if not options.skipaddons:
-        if grml_flavour.endswith('-small'):
-            logging.info("Note: grml-small doesn't provide any addons, not installing them therefore.")
+        if not search_file('addons', iso_mount):
+            logging.info("Could not find addons, therefore not installing.")
         else:
             copy_addons(iso_mount, target)