From d19136186e7eeee7662985f0ffb0a2573262bb8a Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Sep 2009 09:54:51 +0200 Subject: [PATCH] postinst-setup: simplify --- postinst-setup | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/postinst-setup b/postinst-setup index 5b69f88..0172b2c 100755 --- a/postinst-setup +++ b/postinst-setup @@ -6,13 +6,8 @@ if [ -d /home/martin/backup ] && [ ! -d /var/backups/martin ]; then rm -rf /home/martin/backup fi -# install already shipped debs -UBUNTU_CD="/home/martin/download/ubuntu/`lsb_release -c`-alternate-`dpkg --print-architecture`.iso" -if [ -r "$UBUNTU_CD" ]; then - mount -o loop "$UBUNTU_CD" /cdrom - apt-cdrom -m add -fi -DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends build-essential fakeroot devscripts postfix openssh-server bzr python-paramiko +# need bzr and postfix for the setup below +DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends postfix openssh-server bzr python-paramiko # root's ssh stuff if [ ! -d /root/.ssh ] && [ -d /home/martin/.ssh ]; then @@ -73,13 +68,11 @@ rm -f /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp* # install packages from network sources killall apt-get || true -apt-get update -o Acquire::Http::No-Cache=true +apt-get update -DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim bzrtools bzr-svn patchutils offlineimap wipe diffstat gtimelog jigdo-file libtool devhelp python-doc manpages-dev gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-plugins-bad-multiverse gstreamer0.10-plugins-ugly-multiverse gstreamer0.10-ffmpeg weechat weechat-plugins weechat-scripts dpatch wdiff debian-goodies ccache subversion listadmin quilt python-dev cryptsetup mutt editmoin lintian python-gtk2-doc fakechroot ubuntu-dev-tools dput dchroot fakechroot imagemagick pngquant pdfjam easytag rsnapshot texlive-lang-german texlive-latex-extra python-coverage powertop sane-utils vim-scripts libtemplate-perl kvm bzr-buildpackage git-core greasemonkey +DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim bzrtools bzr-svn patchutils offlineimap wipe diffstat gtimelog jigdo-file libtool devhelp python-doc manpages-dev gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-plugins-bad-multiverse gstreamer0.10-plugins-ugly-multiverse gstreamer0.10-ffmpeg weechat weechat-plugins weechat-scripts dpatch wdiff debian-goodies ccache subversion listadmin quilt python-dev cryptsetup mutt editmoin lintian python-gtk2-doc fakechroot ubuntu-dev-tools dput dchroot fakechroot imagemagick pngquant pdfjam easytag rsnapshot texlive-lang-german texlive-latex-extra python-coverage powertop sane-utils vim-scripts libtemplate-perl kvm bzr-buildpackage git-core greasemonkey build-essential fakeroot devscripts apt-get -y build-dep postgresql-8.4 hal cups apport jockey calibre gvfs devicekit-disks devicekit-power -umount /cdrom || true - # crontabs crontab -u martin - <