← Back to branch summary

~ubuntu-branches/ubuntu/precise/livecd-rootfs/precise-updates

« back to all changes in this revision

Viewing changes to live-build/auto/config

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2012-04-20 00:29:38 UTC
  • Revision ID: package-import@ubuntu.com-20120420002938-1mi9nkiw0pvm6uf0
Tags: 2.65
https://launchpad.net/bugs/819899
https://launchpad.net/bugs/985258
https://launchpad.net/bugs/985737
https://launchpad.net/bugs/985280
https://launchpad.net/bugs/819900
https://launchpad.net/bugs/985291
* Add (extra-)override parsing to the preinstalled pool to make sure
  we get task headers in the local pool for tasksel (LP: #819899)
* Move temp directories under config so they get cleaned properly
* Invoke apt-get update once with only the sources.list fragment
  for the local archive, so our package/task selection more closely
  mimics the CD experience (LP: #985258, #985737, #985280, #819900)
* Write out a standard sources.list entry for preinstalled systems
  that's similar to the one generated by installers (LP: #985291)

Show diffs side-by-side

added added

removed removed

Lines of Context:
live-build/auto/config
95
95
esac
96
96
 
97
97
if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
 
98
        # This is an oem-config preinstalled image, touch a random file that
 
99
        # we can refer back to during build, cause that's wildly hackish
 
100
        touch config/oem-config-preinstalled
98
101
        case $PROJECT in
99
102
                kubuntu*)
100
103
                        add_package live oem-config-kde ubiquity-frontend-kde
192
195
 
193
196
        ubuntu-server)
194
197
                add_task install minimal standard
 
198
                COMPONENTS='main'
195
199
                PREINSTALL_POOL_SEEDS='server-ship'
196
200
                ;;
197
201
 
249
253
                                add_package install zram-config
250
254
                                add_package live ac100-tarball-installer
251
255
                                BINARY_REMOVE_LINUX=false
252
 
                                PREINSTALL_POOL_SEEDS=""
253
256
                                ;;
254
257
                esac
255
258
                ;;
317
320
}
318
321
 
319
322
expand_inheritance () {
320
 
        for seed in $(grep "^$1:" germinate-output/structure | cut -d: -f2); do
 
323
        for seed in $(grep "^$1:" config/germinate-output/structure | cut -d: -f2); do
321
324
                expand_inheritance "$seed"
322
325
        done
323
326
        add_inheritance "$1"
331
334
 
332
335
if [ "$PREINSTALLED" = "true" ]; then
333
336
        if [ -n "$PREINSTALL_POOL_SEEDS" ]; then
334
 
                rm -rf germinate-output && mkdir germinate-output
 
337
                mkdir -p config/germinate-output
335
338
                case $PROJECT in
336
339
                        kubuntu-active*)
337
340
                                SEED=kubuntu-active.$SUITE
346
349
                                SEED=ubuntu.$SUITE
347
350
                                ;;
348
351
                esac
349
 
                (cd germinate-output && germinate --no-rdepends --no-installer \
 
352
                (cd config/germinate-output && germinate --no-rdepends --no-installer \
350
353
                        -S $SEEDMIRROR -m $MIRROR -d $SUITE -s $SEED \
351
354
                        ${COMPONENTS:+-c "$COMPONENTS"} -a $ARCH)
352
355
 
371
374
 
372
375
                for i in $PPS_EXP; do
373
376
                        PREINSTALL_POOL="$PREINSTALL_POOL $(awk '{print $1}' \
374
 
                        germinate-output/$i | egrep -v '^-|^Package|^\|' | tr '\n' ' ')"
 
377
                        config/germinate-output/$i | egrep -v '^-|^Package|^\|' | tr '\n' ' ')"
375
378
                done
376
379
        fi
377
380
        if [ -n "$PREINSTALL_POOL" ]; then
378
 
                rm -rf gnupg && mkdir gnupg
 
381
                mkdir -p config/gnupg
 
382
                mkdir -p config/indices
 
383
                for component in $COMPONENTS; do
 
384
                        (cd config/indices && \
 
385
                         wget $MIRROR/indices/override.$SUITE.$component && \
 
386
                         wget $MIRROR/indices/override.$SUITE.extra.$component \
 
387
                        )
 
388
                done
379
389
                PREINSTALL_POOL_HOOK=config/chroot_local-hooks/preinstall-pool.sh
380
390
                echo "#! /bin/sh" > $PREINSTALL_POOL_HOOK
381
 
                echo "mkdir -p /var/lib/preinstalled-pool/" >> $PREINSTALL_POOL_HOOK
382
 
                echo "cd /var/lib/preinstalled-pool/" >> $PREINSTALL_POOL_HOOK
 
391
                echo "mkdir -p /var/lib/preinstalled-pool/pool/" >> $PREINSTALL_POOL_HOOK
 
392
                echo "cd /var/lib/preinstalled-pool/pool/" >> $PREINSTALL_POOL_HOOK
383
393
                echo "apt-get -y download $PREINSTALL_POOL" >> $PREINSTALL_POOL_HOOK
384
394
        fi
385
395
fi