X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=0d1c4cd384267c8aa11a426b61796b75b651f767;hp=0aed77ed9a7cd0624ecd61715068fd8f84a34956;hb=3c4e3e3a72c4272f3d31f27fe4f4926239bdf3ac;hpb=644f7bd9efceda1d9bb4c0985b02c3a98241844c

diff --git a/grml-live b/grml-live
index 0aed77e..0d1c4cd 100755
--- a/grml-live
+++ b/grml-live
@@ -147,7 +147,13 @@ fi
 
 # source main configuration file:
 LIVE_CONF=/etc/grml/grml-live.conf
-. $LIVE_CONF
+if ! [ -r "$LIVE_CONF" ] ; then
+  ewarn "Configuration file $LIVE_CONF can not be read, ignoring"
+else
+  einfo "Sourcing configuration file $LIVE_CONF"
+  . $LIVE_CONF
+  eend $?
+fi
 # }}}
 
 # umount all directories {{{
@@ -1221,7 +1227,7 @@ fi
 # create md5sum file:
 if [ -z "$BOOTSTRAP_ONLY" ] ; then
   ( cd $BUILD_OUTPUT/GRML/"${GRML_NAME}" &&
-  find .. -type f -not -name md5sums -not -name isolinux.bin -exec md5sum {} \; > md5sums )
+  find ../.. -type f -not -name md5sums -not -name isolinux.bin -exec md5sum {} \; > md5sums )
 fi
 # }}}
 
@@ -1429,7 +1435,7 @@ create_netbootpackage() {
 
   mkdir -p "$NETBOOT"
 
-  if ! [ -r "${CHROOT}/usr/lib/syslinux/pxelinux.0" ] ; then
+  if ! [ -r "${CHROOT_OUTPUT}/usr/lib/syslinux/pxelinux.0" ] ; then
     ewarn "File /usr/lib/syslinux/pxelinux.0 not found in build chroot." ; eend 0
     eindent
     einfo "Install syslinux[-common] package in chroot to get a netboot package."