~ubuntu-branches/ubuntu/quantal/ubiquity/quantal

« back to all changes in this revision

Viewing changes to d-i/source/netcfg/base-installer.d/40netcfg

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2012-07-23 11:02:13 UTC
  • Revision ID: package-import@ubuntu.com-20120723110213-yb433zp3se0x2te6
Tags: 2.11.18
* Don't bother keeping track of keyboard model names and identifiers, as
  nothing in ubiquity uses them right now.
* Fix reversed uses of methods mapping between keyboard layout/variant IDs
  and human-readable names, and improve method naming and documentation to
  make this mistake less likely in future (LP: #1027207, #1027620).
* Automatic update of included source packages: debian-installer-utils
  1.91ubuntu3, flash-kernel 3.0~rc.4ubuntu9, netcfg 1.68ubuntu15.

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
        fi
13
13
done
14
14
 
15
 
if [ ! -e /target/sbin/resolvconf ] && [ -f /etc/resolv.conf ]; then
16
 
        mkdir -p /target/etc
17
 
        cp /etc/resolv.conf /target/etc/resolv.conf
 
15
if [ -f /etc/resolv.conf ]; then
 
16
        if [ -e /target/sbin/resolvconf ]; then
 
17
                if [ -d /target/run/resolvconf ]; then
 
18
                        # resolvconf won't be running during installation,
 
19
                        # so make sure that we at least have basic
 
20
                        # configuration in place.  If there's anything
 
21
                        # complicated that needs to persist, netcfg will
 
22
                        # have written that to /etc/network/interfaces.
 
23
                        cp /etc/resolv.conf /target/run/resolvconf/resolv.conf
 
24
                fi
 
25
        else
 
26
                mkdir -p /target/etc
 
27
                cp /etc/resolv.conf /target/etc/resolv.conf
 
28
        fi
18
29
fi