diff -Nuar ubiquity.orig/scripts/install.py ubiquity/scripts/install.py --- ubiquity.orig/scripts/install.py 2010-01-18 10:21:56.000000000 +0100 +++ ubiquity/scripts/install.py 2010-01-18 11:12:50.000000000 +0100 @@ -36,6 +36,7 @@ import syslog import gzip import debconf +import commands import warnings warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) import apt_pkg @@ -579,9 +580,23 @@ def generate_blacklist(self): + lliurexcmd="llxcfg-bootvar imagename | sed -e 's%\..*$%%'" + tmp1=commands.getoutput(lliurexcmd) + manifest_name="" + manifest_name_desktop="" + + #If not parameter value then default value. + #If parameter present then + if len(tmp1) == 0 : + manifest_name='filesystem.manifest' + else: + manifest_name=tmp1+'.manifest' + + manifest_name_desktop=manifest_name+'-desktop' + manifest_desktop = os.path.join(self.casper_path, - 'filesystem.manifest-desktop') - manifest = os.path.join(self.casper_path, 'filesystem.manifest') + manifest_name_desktop) + manifest = os.path.join(self.casper_path, manifest_name) if (os.path.exists(manifest_desktop) and os.path.exists(manifest)): desktop_packages = set() @@ -2275,9 +2290,23 @@ # don't bother with a progress bar for that. # Check for packages specific to the live CD. + lliurexcmd="llxcfg-bootvar imagename | sed -e 's%\..*$%%'" + tmp1=commands.getoutput(lliurexcmd) + manifest_name="" + manifest_name_desktop="" + + #If not parameter value then default value. + #If parameter present then + if len(tmp1) == 0 : + manifest_name='filesystem.manifest' + else: + manifest_name=tmp1+'.manifest' + + manifest_name_desktop=manifest_name+'-desktop' + manifest_desktop = os.path.join(self.casper_path, - 'filesystem.manifest-desktop') - manifest = os.path.join(self.casper_path, 'filesystem.manifest') + manifest_name_desktop) + manifest = os.path.join(self.casper_path, manifest_name) if (os.path.exists(manifest_desktop) and os.path.exists(manifest)): desktop_packages = set()