← Back to branch summary

~logan/ubuntu/quantal/casper/fixes-1057234

« back to all changes in this revision

Viewing changes to scripts/casper-bottom/23networking

  • Committer: Stéphane Graber
  • Date: 2012-07-04 02:38:13 UTC
  • Revision ID: stgraber@ubuntu.com-20120704023813-fbs8ls7neai72scu
Remove network-manager override and fix path to net-DEVICE.conf file

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/casper-bottom/23networking
73
73
EOF
74
74
        done
75
75
    fi
76
 
 
77
 
    if [ -n "${NETBOOT}" ] && [ -x /root/usr/sbin/NetworkManager ]; then
78
 
        # Disable Network Manager on netboot to avoid loosing connectivity to the media
79
 
        echo "manual" > /root/etc/init/network-manager.override
80
 
    fi
81
 
 
82
76
    if [ ! -f /root/etc/resolv.conf ] || [ -z "$(cat /root/etc/resolv.conf)" ]; then
83
 
        if [ -n "${DEVICE}" ] && [ -e /tmp/net-"${DEVICE}".conf ]; then
 
77
        if [ -n "${DEVICE}" ] && [ -e /root/run/net-"${DEVICE}".conf ]; then
84
78
            # create a resolv.conf if it is not present
85
 
            cp /tmp/net-"${DEVICE}".conf /root/var/log/netboot.config
86
79
            #ipconfig quotes DNSDOMAIN, quotes need to be removed for a correct resolv.conf
87
 
            rc_search="$(sed -n "s/^DNSDOMAIN='\(.*\)'/\1/p" /tmp/net-"${DEVICE}".conf)"
 
80
            rc_search="$(sed -n "s/^DNSDOMAIN='\(.*\)'/\1/p" /root/run/net-"${DEVICE}".conf)"
88
81
            #search might contain multiple entries but domain should only have one.
89
 
            rc_domain="$(sed -n "s/^DNSDOMAIN='\([^ ]*\).*'/\1/p" /tmp/net-"${DEVICE}".conf)"
90
 
            rc_server0="$(sed -n "s/^IPV4DNS0='\(.*\)'/\1/p" /tmp/net-"${DEVICE}".conf)"
91
 
            rc_server1="$(sed -n "s/^IPV4DNS1='\(.*\)'/\1/p" /tmp/net-"${DEVICE}".conf)"
 
82
            rc_domain="$(sed -n "s/^DNSDOMAIN='\([^ ]*\).*'/\1/p" /root/run/net-"${DEVICE}".conf)"
 
83
            rc_server0="$(sed -n "s/^IPV4DNS0='\(.*\)'/\1/p" /root/run/net-"${DEVICE}".conf)"
 
84
            rc_server1="$(sed -n "s/^IPV4DNS1='\(.*\)'/\1/p" /root/run/net-"${DEVICE}".conf)"
92
85
 
93
86
            # Deal with resolvconf
94
87
            # Writing to /run instead or /root/run as /sbin/init will move /run