Commit 7f12f6c3 authored by Daniel Bissani Furlin's avatar Daniel Bissani Furlin

Issue SCRUM#261:fix manifest-desktop and manifest

parent f5602be3
...@@ -2,4 +2,5 @@ chroot ...@@ -2,4 +2,5 @@ chroot
chroot-ultima.tar.gz chroot-ultima.tar.gz
*.swp *.swp
iso/**/*.iso iso/**/*.iso
src/preseed/.preseed.bkp
initrd* initrd*
#le-all le-all
linux-generic linux-generic
plymouth-x11 plymouth-x11
plymouth-theme-le-logo plymouth-theme-le-logo
......
...@@ -6,6 +6,5 @@ casper ...@@ -6,6 +6,5 @@ casper
lupin-casper lupin-casper
user-setup user-setup
discover discover
os-prober
libdebian-installer4 libdebian-installer4
le-ubiquity-slideshow le-ubiquity-slideshow
...@@ -40,6 +40,7 @@ PREFIX=$PWD ...@@ -40,6 +40,7 @@ PREFIX=$PWD
source common.sh source common.sh
#This packages must not appear in the manifest #This packages must not appear in the manifest
sudo cp ${TMP}/image/casper/filesystem.manifest ${TMP}/image/casper/filesystem.manifest-desktop sudo cp ${TMP}/image/casper/filesystem.manifest ${TMP}/image/casper/filesystem.manifest-desktop
IFS_OLD=$IFS IFS_OLD=$IFS
IFS=$'\n' IFS=$'\n'
...@@ -48,5 +49,4 @@ do ...@@ -48,5 +49,4 @@ do
sudo sed -i "/${package}/d" ${TMP}/image/casper/filesystem.manifest-desktop sudo sed -i "/${package}/d" ${TMP}/image/casper/filesystem.manifest-desktop
done done
IFS=$IFS_OLD IFS=$IFS_OLD
exit 0 exit 0
...@@ -39,11 +39,6 @@ export PREFIX=$PWD ...@@ -39,11 +39,6 @@ export PREFIX=$PWD
source common.sh source common.sh
#mount casper dir on chroot for generating the manifest file chroot $CHROOTDIR dpkg-query -W --showformat='${Package} ${Version}\n' > ${TMP}/image/casper/filesystem.manifest
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"
exit 0 exit 0
../../../scripts-available/post-epilogue.sh
\ No newline at end of file
ubiquity ubiquity/use_nonfree boolean true ubiquity ubiquity/use_nonfree boolean true
d-i apt-setup/backports boolean false d-i apt-setup/backports boolean false
ubiquity ubiquity/success_command \ ubiquity ubiquity/success_command \
string in-target apt-get -y purge ubiquity; \ string in-target apt-get -y install le-conf || \
in-target apt-get -y purge le-live-all; \
in-target apt-get -y install le-conf || \
(package_path=$(find /cdrom/ -name "le-conf*.deb") && \ (package_path=$(find /cdrom/ -name "le-conf*.deb") && \
package=$(basename ${package_path}) && \ package=$(basename ${package_path}) && \
cp ${package_path} /target/ && \ cp ${package_path} /target/ && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment