From f9355fd9b5d5a708383fe8a4ba48f47aae97f5f6 Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Date: Wed, 14 Sep 2016 11:53:08 +0000
Subject: jetson: stop relying on network-manager

Change-Id: I6d177db20b46ed84605a63b9f854c1e5edc773db
---
 jetson/1-prepare-disk.sh  |  6 ++++++
 jetson/4-config-system.sh | 13 ++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/jetson/1-prepare-disk.sh b/jetson/1-prepare-disk.sh
index 574121d..f2dc013 100755
--- a/jetson/1-prepare-disk.sh
+++ b/jetson/1-prepare-disk.sh
@@ -83,6 +83,12 @@ $cat_cmd $rootfs_tar | (cd $mnt; tar x$tar_opt)
 rm -f $mnt/README*
 echo "${disk}2 none swap sw 0 0" >> $mnt/etc/fstab
 echo "nameserver 8.8.8.8/" > $mnt/etc/resolv.conf
+cat <<EOF >> $mnt/etc/network/interfaces
+
+auto eth0
+iface eth0 inet dhcp
+EOF
+
 rsync -a "$(dirname $0)/../" $mnt/root/lab-ansible/
 
 umount $mnt
diff --git a/jetson/4-config-system.sh b/jetson/4-config-system.sh
index 3a99aa7..99c92f2 100755
--- a/jetson/4-config-system.sh
+++ b/jetson/4-config-system.sh
@@ -51,17 +51,10 @@ apt-get update
 
 echo "REMOVING UNNECESSARY PACKAGES"
 
-if [ x"$distro" = x"trusty" ]; then
-    hold_packages="network-manager"
-    install_packages=""
-else
-    hold_packages="ifupdown netbase"
-    install_packages="network-manager"
-fi
+hold_packages="ifupdown netbase"
 install_packages="$install_packages git vim"
 
 apt-get install -y $hold_packages
-apt-mark hold $hold_packages
 
 $tasksel_apt_get remove ubuntu-desktop^
 apt-get autoremove -y
@@ -70,8 +63,6 @@ echo "RE-INSTALLING OPENSSH SERVER"
 apt-get purge -y openssh-server
 $tasksel_apt_get install openssh-server^
 
-apt-mark unhold $hold_packages
-
 echo "UPGRADING THE PACKAGES"
 apt-get upgrade -y
 
@@ -79,6 +70,6 @@ echo "DIST-UPGRADING THE PACKAGES"
 apt-get dist-upgrade -y
 
 echo "INSTALLING ADDITIONAL PACKAGES"
-apt-get install -y $hold_packages $install_packages
+apt-get install -y $install_packages
 
 echo "ALL DONE"
-- 
cgit v1.2.3