Commit 45f12012 authored by Guido Gunther's avatar Guido Gunther

Merge branch 'unnest-functions' into 'master'

root.sh : move create_report out of setup_network

See merge request !55
parents 1837cf10 1e6c1207
Pipeline #2416 passed with stage
in 13 seconds
......@@ -229,6 +229,17 @@ allow-hotplug eth0
iface eth0 inet dhcp
EOF
# Don't setup resolv.conf if it's a symlink
# DHCP will later handle this just fine
if [ -f "${basedir}/etc/resolv.conf" ]; then
cat <<EOF > "${basedir}/etc/resolv.conf"
nameserver 208.67.220.220
nameserver 208.67.222.222
EOF
fi
}
function create_report()
{
echo "Installed packages:"
......@@ -240,16 +251,6 @@ function create_report()
}
# Don't setup resolv.conf if it's a symlink
# DHCP will later handle this just fine
if [ -f "${basedir}/etc/resolv.conf" ]; then
cat <<EOF > "${basedir}/etc/resolv.conf"
nameserver 208.67.220.220
nameserver 208.67.222.222
EOF
fi
}
# create the directories so that this script can be tested without the generated filesystem
mkdir -p "${basedir}/etc/apt/apt.conf.d/"
mkdir -p "${basedir}/etc/network"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment