X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=install-manifest;h=a770d3bc6175be7759e1bb58a14ef4c0a333914e;hp=1fd337c23a72b366d417815bab427f3865c015cb;hb=4f3fa2a9d54689cd022d3aaea7812bfd54faf767;hpb=6c8261c08d6e3f0666f91da3339a98176cb945b2

diff --git a/install-manifest b/install-manifest
index 1fd337c..a770d3b 100755
--- a/install-manifest
+++ b/install-manifest
@@ -3,8 +3,8 @@
 import urllib, sys, optparse, re, subprocess
 
 kernel_pkg_re = re.compile('^linux-(generic|firmware|headers|image|backports|ec2|source|virtual|preempt)')
-no_remove_re = re.compile('^bcmwl-|^dkms|^grub|^xserver-xorg-video-intel')
-no_install_re = re.compile('^ubiquity|^casper|debian-install')
+no_remove_re = re.compile('^bcmwl-|^dkms|^grub|^xserver-xorg-video-intel|bootchart|^openssh-client')
+no_install_re = re.compile('^ubiquity|^casper|debian-install|^cryptsetup|^dmsetup|^ecryptfs-utils|^parted|^redboot-tools|^tasksel|^aptitude|^os-prober|^devio')
 
 def parse_argv():
     '''Parse CLI options.
@@ -54,10 +54,6 @@ for l in dpkg.stdout:
     if no_remove_re.search(pkg):
         selection += '%s\tinstall\n' % pkg
 
-if subprocess.call(['which', 'dselect'], stdout=subprocess.PIPE) != 0:
-    print >> sys.stderr, 'INFO: installing dselect (needed by this script)'
-    assert subprocess.call(['apt-get', 'install', 'dselect']) == 0
-
 # now apply the new selections
 assert subprocess.call(['dpkg', '--clear-selections']) == 0
 dpkg = subprocess.Popen(['dpkg', '--set-selections'], stdin=subprocess.PIPE)
@@ -65,4 +61,4 @@ dpkg.communicate(selection)
 assert dpkg.returncode == 0
 
 # commit!
-subprocess.call(['dselect', 'install'])
+subprocess.call(['apt-get', 'dselect-upgrade'])