Issue SCRUM#261:fix manifest-desktop and manifest

.gitignore

@@ -2,4 +2,5 @@ chroot
 chroot-ultima.tar.gz
 *.swp
 iso/**/*.iso
+src/preseed/.preseed.bkp
 initrd*

pkg-list/le6/testing/install.list

-#le-all
+le-all
 linux-generic
 plymouth-x11
 plymouth-theme-le-logo

pkg-list/le6/testing/remove-desktop.list

@@ -6,6 +6,5 @@ casper
 lupin-casper
 user-setup
 discover
-os-prober
 libdebian-installer4
 le-ubiquity-slideshow

scripts-available/manifest.sh

@@ -40,6 +40,7 @@ PREFIX=$PWD
 source common.sh
 
 #This packages must not appear in the manifest
+
 sudo cp ${TMP}/image/casper/filesystem.manifest ${TMP}/image/casper/filesystem.manifest-desktop
 IFS_OLD=$IFS
 IFS=$'\n'
@@ -48,5 +49,4 @@ do
     sudo sed -i "/${package}/d" ${TMP}/image/casper/filesystem.manifest-desktop
 done
 IFS=$IFS_OLD
-
 exit 0

scripts-available/pre-manifest.sh

@@ -39,11 +39,6 @@ export PREFIX=$PWD
 
 source common.sh
 
-#mount casper dir on chroot for generating the manifest file
-mkdir -p ${CHROOTDIR}/casper/
-mount --bind ${TMP}image/casper ${CHROOTDIR}/casper || \
-log ERROR "While mounting ${TMP}image/casper on ${CHROOTDIR}casper"
-
-addToChrootFile $CHROOTFILE "dpkg-query -W --showformat='${Package} ${Version}\n' > /casper/filesystem.manifest"
+chroot $CHROOTDIR dpkg-query -W --showformat='${Package} ${Version}\n' > ${TMP}/image/casper/filesystem.manifest
 
 exit 0

scripts-enabled/le6/testing/31-post-epilogue.sh

-../../../scripts-available/post-epilogue.sh
\ No newline at end of file

src/preseed/preseed.cfg

 ubiquity ubiquity/use_nonfree boolean true
 d-i apt-setup/backports boolean false
 ubiquity ubiquity/success_command \
-    string in-target apt-get -y purge ubiquity; \
-    in-target apt-get -y purge le-live-all; \
-    in-target apt-get -y install le-conf || \
+    string in-target apt-get -y install le-conf || \
     (package_path=$(find /cdrom/ -name "le-conf*.deb") && \
     package=$(basename ${package_path}) && \
     cp ${package_path} /target/ && \