← Back to branch summary

~vorlon/live-build/cloud-images-ppc64el

« back to all changes in this revision

Viewing changes to scripts/build/lb_chroot_resolv

  • Committer: Ben Howard
  • Date: 2012-07-02 21:06:23 UTC
  • Revision ID: ben.howard@canonical.com-20120702210623-af7oehp0owh4abai
Fix for Oneiric build failures caused by resolvconf fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/build/lb_chroot_resolv
40
40
                # Creating lock file
41
41
                Create_lockfile .lock
42
42
 
43
 
                if [ "$(readlink chroot/etc/resolv.conf)" = "../run/resolvconf/resolv.conf" ]
 
43
                rlink="$(readlink chroot/etc/resolv.conf)" ||
 
44
                        rlink="chroot/etc/resolv.conf"
 
45
 
 
46
                if [ "${rlink}" = "../run/resolvconf/resolv.conf" ]
44
47
                then
45
48
                        rm chroot/etc/resolv.conf
46
49
                        ln -snf /run/resolvconf/resolv.conf chroot/etc/resolv.conf
59
62
                fi
60
63
 
61
64
                Echo_message "Checking for resolvconf resolver"
62
 
                resolv_loc="$(readlink chroot/etc/resolv.conf)"
63
 
                if [ "${resolv_loc}" != "/run/resolvconf/resolv.conf" -a "${resolv_loc}" != "../run/resolvconf/resolv.conf" -a -f /etc/resolv.conf ]
 
65
                if [ "${rlink}" != "/run/resolvconf/resolv.conf" -a "${rlink}" != "../run/resolvconf/resolv.conf" -a -f /etc/resolv.conf ]
64
66
                then
65
67
                        # Copy resolv file
66
68
                        cp /etc/resolv.conf chroot/etc/resolv.conf