From 2d304daf774fa0ad3382f39e413e65996ebc0458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Thu, 3 Sep 2009 08:54:41 +0000 Subject: [PATCH] Ignore some more entries from the bootable CD. Should fix ticket #4403, test pending. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32918 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/installer/CopyEngine.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/apps/installer/CopyEngine.cpp b/src/apps/installer/CopyEngine.cpp index db412e6bd3..43cde9a7e6 100644 --- a/src/apps/installer/CopyEngine.cpp +++ b/src/apps/installer/CopyEngine.cpp @@ -501,6 +501,20 @@ CopyEngine::_ShouldCopyEntry(const char* name, const struct stat& statInfo, printf("ignoring '%s'.\n", name); return false; } + if (strcmp("rr_moved", name) == 0) { + printf("ignoring '%s'.\n", name); + return false; + } + } + if (level == 1 && S_ISREG(statInfo.st_mode)) { + if (strcmp("boot.catalog", name) == 0) { + printf("ignoring '%s'.\n", name); + return false; + } + if (strcmp("haiku-boot-floppy.image", name) == 0) { + printf("ignoring '%s'.\n", name); + return false; + } } return true; }