From: Michael Prokop <mika@grml.org>
Date: Sun, 18 Oct 2009 20:55:02 +0000 (+0200)
Subject: Raise CriticalException if filesystem.module, kernel or initrd are not present
X-Git-Tag: v0.9.13~31
X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=579dda2838a24e1b71d11b9041264a8c3ecbbc82

Raise CriticalException if filesystem.module, kernel or initrd are not present
---

diff --git a/grml2usb b/grml2usb
index dc63b1b..7d67047 100755
--- a/grml2usb
+++ b/grml2usb
@@ -955,6 +955,7 @@ def copy_system_files(grml_flavour, iso_mount, target):
     filesystem_module = search_file('filesystem.module', iso_mount)
     if filesystem_module is None:
         logging.critical("Fatal: filesystem.module not found")
+        raise CriticalException("error locating filesystem.module file")
     else:
         exec_rsync(filesystem_module, squashfs_target + 'filesystem.module')
 
@@ -964,12 +965,14 @@ def copy_system_files(grml_flavour, iso_mount, target):
     kernel = search_file('linux26', iso_mount)
     if kernel is None:
         logging.critical("Fatal kernel not found")
+        raise CriticalException("error locating kernel file")
     else:
         exec_rsync(kernel, release_target + '/linux26')
 
     initrd = search_file('initrd.gz', iso_mount)
     if initrd is None:
         logging.critical("Fatal: initrd not found")
+        raise CriticalException("error locating initrd file")
     else:
         exec_rsync(initrd, release_target + '/initrd.gz')