From 36fc3cb384c23a3cd6bd42d1e2e83764a637e1d5 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Sat, 13 Oct 2012 11:46:19 +0200 Subject: [PATCH] disable all slideshows on al preinstalled images, due to (LP: #1066046) --- debian/changelog | 7 +++++++ live-build/auto/config | 12 ++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 56692f6f..bdc087f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.92) UNRELEASED; urgency=low + + * disable all slideshows on al preinstalled images, due to (LP: #1066046) + the installer crashes when trying to start up webkit for teh slideshow + + -- Oliver Grawert Sat, 13 Oct 2012 11:44:52 +0200 + livecd-rootfs (2.91) quantal; urgency=low * make sure preinstalled ac100 images have multiverse enabled in their diff --git a/live-build/auto/config b/live-build/auto/config index a6f25a13..09b25893 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -134,15 +134,18 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then case $PROJECT in kubuntu*) add_package live oem-config-kde ubiquity-frontend-kde - add_package live ubiquity-slideshow-kubuntu + # work around quantal bug 1066046 (webkit crashes teh slideshow) + #add_package live ubiquity-slideshow-kubuntu ;; lubuntu*) add_package live oem-config-gtk ubiquity-frontend-gtk - add_package live ubiquity-slideshow-lubuntu + # work around quantal bug 1066046 (webkit crashes teh slideshow) + # add_package live ubiquity-slideshow-lubuntu ;; xubuntu*) add_package live oem-config-gtk ubiquity-frontend-gtk - add_package live ubiquity-slideshow-xubuntu + # work around quantal bug 1066046 (webkit crashes teh slideshow) + #add_package live ubiquity-slideshow-xubuntu ;; ubuntu-server) add_package live oem-config-debconf ubiquity-frontend-debconf @@ -151,7 +154,8 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then ;; *) add_package live oem-config-gtk ubiquity-frontend-gtk - add_package live ubiquity-slideshow-ubuntu + # work around quantal bug 1066046 (webkit crashes teh slideshow) + #add_package live ubiquity-slideshow-ubuntu ;; esac fi