From ac998e3b04dd45d73163b51e4641cf472a6e488b Mon Sep 17 00:00:00 2001
From: Andrew McDermott <andrew.mcdermott@linaro.org>
Date: Fri, 16 Jan 2015 12:57:39 +0000
Subject: Don't remove resolv.conf info

---
 build          |   4 +-
 extra-packages | 508 ---------------------------------------------------------
 geronimo       |   5 +-
 3 files changed, 3 insertions(+), 514 deletions(-)
 delete mode 100644 extra-packages

diff --git a/build b/build
index 2a3219e..2bec1cb 100755
--- a/build
+++ b/build
@@ -6,7 +6,7 @@ d=$(mktemp -d --tmpdir XXXXXX-${name})
 : ${DEST:=${d}/$name}
 
 clean_up() { sudo rm -rf "$d"; }
-trap clean_up EXIT
+trap clean_up EXIT INT
 
 # On trusty you will need to install an update of the qemu package -
 # or one that has qemu-aarch64-static(1). You can search for an update
@@ -38,5 +38,5 @@ sudo cp post-debootstrap $DEST/post-debootstrap
 sudo $xchroot $DEST /post-debootstrap
 sudo rm $DEST/post-debootstrap
 echo localhost | sudo tee $DEST/etc/hostname
-sudo tar -C $d -acf $name.tar.bz2 $name
+sudo tar -C $d -acf $name.tar $name
 sudo rm -rf $d
diff --git a/extra-packages b/extra-packages
deleted file mode 100644
index 2df19d1..0000000
--- a/extra-packages
+++ /dev/null
@@ -1,508 +0,0 @@
-adduser
-apache2
-apache2-bin
-apache2-data
-apt
-apt-utils
-base-files
-base-passwd
-bash
-bc
-binutils
-bridge-utils
-bsdutils
-build-essential
-busybox-initramfs
-bzip2
-ca-certificates
-cloud-guest-utils
-comerr-dev
-console-setup
-coreutils
-cpio
-cpp
-cpp-4.8
-cron
-curl
-dash
-debconf
-debconf-i18n
-debianutils
-dh-python
-diffutils
-dmsetup
-dnsmasq-base
-dnsmasq-utils
-docutils-common
-docutils-doc
-dpkg
-dpkg-dev
-e2fslibs
-e2fsprogs
-eatmydata
-ebtables
-eject
-erlang-asn1
-erlang-base
-erlang-corba
-erlang-crypto
-erlang-diameter
-erlang-edoc
-erlang-eldap
-erlang-erl-docgen
-erlang-eunit
-erlang-ic
-erlang-inets
-erlang-mnesia
-erlang-nox
-erlang-odbc
-erlang-os-mon
-erlang-parsetools
-erlang-percept
-erlang-public-key
-erlang-runtime-tools
-erlang-snmp
-erlang-ssh
-erlang-ssl
-erlang-syntax-tools
-erlang-tools
-erlang-webtool
-erlang-xmerl
-ethtool
-euca2ools
-fakeroot
-file
-findutils
-fontconfig-config
-fonts-dejavu-core
-g++
-g++-4.8
-gawk
-gcc
-gcc-4.8
-gcc-4.8-base
-gcc-4.9-base
-genisoimage
-gettext
-gettext-base
-git
-git-core
-git-man
-gnupg
-gpgv
-grep
-gzip
-hdparm
-hostname
-ifupdown
-init-system-helpers
-initramfs-tools
-initramfs-tools-bin
-initscripts
-insserv
-iproute2
-iptables
-iputils-arping
-iputils-ping
-isc-dhcp-client
-isc-dhcp-common
-javascript-common
-kbd
-keyboard-configuration
-klibc-utils
-kmod
-kpartx
-krb5-multidev
-less
-libacl1
-libaio1
-libalgorithm-diff-perl
-libalgorithm-diff-xs-perl
-libalgorithm-merge-perl
-libapache2-mod-wsgi
-libapr1
-libaprutil1
-libaprutil1-dbd-sqlite3
-libaprutil1-ldap
-libapt-inst1.5
-libapt-pkg4.12
-libarchive-extract-perl
-libasn1-8-heimdal
-libasprintf-dev
-libasprintf0c2
-libatomic1
-libattr1
-libaudit-common
-libaudit1
-libblas3
-libblkid1
-libboost-atomic1.54.0
-libboost-system1.54.0
-libboost-thread1.54.0
-libbsd0
-libbz2-1.0
-libc-bin
-libc-dev-bin
-libc6
-libc6-dev
-libcap2
-libcap2-bin
-libcgmanager0
-libck-connector0
-libcloog-isl4
-libcomerr2
-libconfig-general-perl
-libcroco3
-libcurl3
-libcurl3-gnutls
-libdb5.3
-libdbd-mysql-perl
-libdbi-perl
-libdbus-1-3
-libdebconfclient0
-libdevmapper-event1.02.1
-libdevmapper1.02.1
-libdpkg-perl
-libdrm2
-libedit2
-liberror-perl
-libestr0
-libexpat1
-libexpat1-dev
-libfakeroot
-libffi-dev
-libffi6
-libfile-fcntllock-perl
-libfontconfig1
-libfreetype6
-libfribidi0
-libgcc-4.8-dev
-libgcc1
-libgcrypt11
-libgdbm3
-libgettextpo-dev
-libgettextpo0
-libgfortran3
-libglib2.0-0
-libgmp10
-libgnutls-openssl27
-libgnutls26
-libgomp1
-libgpg-error0
-libgssapi-krb5-2
-libgssapi3-heimdal
-libgssrpc4
-libhcrypto4-heimdal
-libheimbase1-heimdal
-libheimntlm0-heimdal
-libhtml-template-perl
-libhx509-5-heimdal
-libibverbs1
-libidn11
-libisl10
-libjbig0
-libjpeg-turbo8
-libjpeg8
-libjs-jquery
-libjs-jquery-hotkeys
-libjs-jquery-isonscreen
-libjs-jquery-metadata
-libjs-jquery-tablesorter
-libjs-sphinxdoc
-libjs-underscore
-libjson-c2
-libjson0
-libk5crypto3
-libkadm5clnt-mit9
-libkadm5srv-mit9
-libkdb5-7
-libkeyutils1
-libklibc
-libkmod2
-libkrb5-26-heimdal
-libkrb5-3
-libkrb5-dev
-libkrb5support0
-liblapack3
-liblcms2-2
-libldap-2.4-2
-libldap2-dev
-liblocale-gettext-perl
-liblockfile-bin
-liblockfile1
-liblog-message-simple-perl
-libltdl7
-liblzma5
-libmagic1
-libmnl0
-libmodule-pluggable-perl
-libmount1
-libmpc3
-libmpdec2
-libmpfr4
-libmysqlclient18
-libncurses5
-libncursesw5
-libnetfilter-conntrack3
-libnewt0.52
-libnfnetlink0
-libnih-dbus1
-libnih1
-libnspr4
-libnss3
-libnss3-nssdb
-libodbc1
-libp11-kit0
-libpam-cap
-libpam-modules
-libpam-modules-bin
-libpam-runtime
-libpam0g
-libpaper-utils
-libpaper1
-libparted0debian1
-libpcap0.8
-libpcre3
-libpcre3-dev
-libpcrecpp0
-libplymouth2
-libpng12-0
-libpod-latex-perl
-libpopt0
-libpq-dev
-libpq5
-libprocps3
-libpython-dev
-libpython-stdlib
-libpython2.7
-libpython2.7-dev
-libpython2.7-minimal
-libpython2.7-stdlib
-libpython3-stdlib
-libpython3.4-minimal
-libpython3.4-stdlib
-librados2
-librbd1
-librdmacm1
-libreadline5
-libreadline6
-libroken18-heimdal
-librtmp0
-libsasl2-2
-libsasl2-dev
-libsasl2-modules-db
-libsctp1
-libselinux1
-libsemanage-common
-libsemanage1
-libsepol1
-libsgutils2-2
-libsigsegv2
-libslang2
-libsqlite3-0
-libss2
-libssl-dev
-libssl-doc
-libssl1.0.0
-libstdc++-4.8-dev
-libstdc++6
-libsysfs2
-libtasn1-6
-libtcl8.6
-libterm-readkey-perl
-libterm-ui-perl
-libtext-charwidth-perl
-libtext-iconv-perl
-libtext-soundex-perl
-libtext-wrapi18n-perl
-libtidy-0.99-0
-libtiff5
-libtimedate-perl
-libtinfo5
-libtk8.6
-libudev1
-libunistring0
-libusb-0.1-4
-libustr-1.0-1
-libuuid1
-libwebp5
-libwebpmux1
-libwind0-heimdal
-libwrap0
-libx11-6
-libx11-data
-libxau6
-libxcb1
-libxdmcp6
-libxext6
-libxft2
-libxml2
-libxml2-dev
-libxmuu1
-libxrender1
-libxslt1-dev
-libxslt1.1
-libxss1
-libxtables10
-libyaml-0-2
-libyaml-dev
-linux-libc-dev
-lksctp-tools
-locales
-lockfile-progs
-login
-logrotate
-lsb-base
-lsb-release
-lsof
-lvm2
-make
-makedev
-manpages
-manpages-dev
-mawk
-mime-support
-module-init-tools
-mount
-mountall
-multiarch-support
-mysql-common
-ncurses-base
-ncurses-bin
-ncurses-term
-net-tools
-netbase
-netcat-openbsd
-ntpdate
-open-iscsi
-openssh-client
-openssh-server
-openssh-sftp-server
-openssl
-parted
-passwd
-patch
-perl
-perl-base
-perl-modules
-plymouth
-pm-utils
-powermgmt-base
-procps
-psmisc
-pylint
-python
-python-anyjson
-python-astroid
-python-chardet
-python-cheetah
-python-cherrypy3
-python-coverage
-python-dateutil
-python-decorator
-python-dev
-python-dns
-python-docutils
-python-egenix-mxdatetime
-python-egenix-mxtools
-python-eventlet
-python-feedparser
-python-formencode
-python-greenlet
-python-html5lib
-python-iso8601
-python-jinja2
-python-libxml2
-python-lockfile
-python-logilab-common
-python-lxml
-python-m2crypto
-python-markupsafe
-python-migrate
-python-minimal
-python-mox
-python-msgpack
-python-mysqldb
-python-nose
-python-numpy
-python-openid
-python-openssl
-python-paste
-python-pastedeploy
-python-pastedeploy-tpl
-python-pastescript
-python-pbr
-python-pil
-python-pkg-resources
-python-pygments
-python-repoze.lru
-python-requestbuilder
-python-requests
-python-roman
-python-routes
-python-scgi
-python-setuptools
-python-six
-python-sphinx
-python-sqlalchemy
-python-sqlalchemy-ext
-python-suds
-python-tempita
-python-tk
-python-unittest2
-python-urllib3
-python-utidylib
-python-webob
-python-xattr
-python2.7
-python2.7-dev
-python2.7-minimal
-python3
-python3-minimal
-python3.4
-python3.4-minimal
-qemu-utils
-rabbitmq-server
-readline-common
-resolvconf
-rsync
-rsyslog
-screen
-sed
-sensible-utils
-sg3-utils
-sgml-base
-sphinx-common
-sphinx-doc
-sqlite3
-ssh-import-id
-ssl-cert
-sudo
-sysv-rc
-sysvinit-utils
-tar
-tcpd
-tcpdump
-tgt
-tzdata
-ubuntu-keyring
-ubuntu-minimal
-ucf
-udev
-unzip
-upstart
-ureadahead
-util-linux
-vim-common
-vim-tiny
-vlan
-watershed
-wget
-whiptail
-x11-common
-xauth
-xkb-data
-xml-core
-xz-utils
-zlib1g
-zlib1g-dev
diff --git a/geronimo b/geronimo
index 199f4c7..5d3bad6 100755
--- a/geronimo
+++ b/geronimo
@@ -4,7 +4,7 @@
 #  enter a chroot with various things bind-mounted so you can do
 #  useful work.
 
-mnt_devices="proc dev dev/pts sys"
+mnt_devices="proc dev dev/pts sys run"
 
 reverse_words() {
     local -a rev=
@@ -19,8 +19,6 @@ start() {
     for i in $mnt_devices ; do
 	sudo mount -o bind /$i "$mnt"/$i
     done
-    sudo mv "$mnt"/etc/resolv.conf "$mnt"/etc/resolv.conf.orig
-    sudo cp /etc/resolv.conf "$mnt"/etc/resolv.conf
     sudo cp /etc/apt/sources.list "$mnt"/etc/apt
     sudo chroot "$mnt" /bin/bash
 }
@@ -30,7 +28,6 @@ stop() {
     for i in $(reverse_words $mnt_devices); do
 	sudo umount "$mnt"/$i
     done
-    sudo mv "$mnt"/etc/resolv.conf.orig "$mnt"/etc/resolv.conf
 }
 
 if [ $# -lt 1 ]; then
-- 
cgit v1.2.3