Make package error check safe for "/" inside the package string

[grml-live.git] / grml-live

diff --git a/grml-live b/grml-live
index 8040739..6d02701 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -809,7 +809,7 @@ else
 <testsuite name="grml-live-missing-packages" tests="${package_count}" time="1" failures="${package_errors}" errors="${package_errors}" skipped="0" assertions="0">
 EOF
 
-  for package in $(awk '{print $1}' "${CHECKLOG}/package_errors.log") ; do
+  for package in $(awk '{print $1}' "${CHECKLOG}/package_errors.log" | sed 's;/;\\/;') ; do
     failure_reason="$(awk "/$package/ {print \$2}" "${CHECKLOG}/package_errors.log")"
     cat >> "${REPORT_MISSING_PACKAGES}" << EOF
   <testcase name="test_missing_packages_${package}" time="0" assertions="0">
@@ -903,7 +903,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
        # copy _required_ isolinux files
        if [ -d "${CHROOT_OUTPUT}/usr/lib/ISOLINUX" ] ; then
          copy_addon_file isolinux.bin /usr/lib/ISOLINUX isolinux
-         for file in /usr/lib/syslinux/modules/bios/*.c32 ; do
+         for file in ${CHROOT_OUTPUT}/usr/lib/syslinux/modules/bios/*.c32 ; do
            copy_addon_file "$(basename "$file")"  /usr/lib/syslinux/modules/bios/ isolinux
          done
        else # syslinux versions <= 3:4.05+dfsg-6+deb8u1