← Back to branch summary

~ubuntu-branches/ubuntu/precise/kickseed/precise

« back to all changes in this revision

Viewing changes to kickseed.sh

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2010-03-05 15:03:32 UTC
  • Revision ID: james.westby@ubuntu.com-20100305150332-en686snrxm1kzu9s
Tags: 0.53ubuntu3
https://launchpad.net/bugs/526422
https://launchpad.net/bugs/419392
* Preseed base-installer/kernel/backports-modules to 'nouveau' if
  installing a desktop task, as a partial workaround for problems
  elsewhere (LP: #526422).
* Be lenient if the Kickstart file author forgets the required space after
  '@' in a %packages section (LP: #419392).

Show diffs side-by-side

added added

removed removed

Lines of Context:
kickseed.sh
180
180
                                continue
181
181
                        fi
182
182
 
 
183
                        group=
183
184
                        if [ "$keyword" = '@' ]; then
184
185
                                group="${line#*[        ]}"
 
186
                        elif [ "${keyword#@}" != "$keyword" ]; then
 
187
                                group="${line#@}"
 
188
                        fi
 
189
                        if [ "$group" ]; then
185
190
                                # TODO: temporary hack to make at least the
186
191
                                # standard desktop work
187
192
                                case $group in
243
248
                                task:*)
244
249
                                        element="~t^${pkg#task:}\$"
245
250
                                        tasklist="${tasklist:+$tasklist, }${pkg#task:}"
 
251
                                        case ${pkg#task:} in
 
252
                                                *-desktop*)
 
253
                                                        # work around https://bugs.launchpad.net/bugs/526422
 
254
                                                        ks_preseed d-i base-installer/kernel/backports-modules string nouveau
 
255
                                                        ;;
 
256
                                        esac
246
257
                                        ;;
247
258
                                pkg:*)
248
259
                                        element="~n^${pkg#pkg:}\$"