postinst-setup updates

diff --git a/postinst-setup b/postinst-setup
index 1d39d99bb9f425dd4195f5adf0b3ba45d9690846..190edf5362d35655541163e89fa002fd8b089d26 100755 (executable)
--- a/postinst-setup
+++ b/postinst-setup
@@ -39,7 +39,7 @@ mv fstab.originst fstab
 
 # only restore the human users from passwd/group
 for i in passwd group; do
-    perl -naF: -e 'print if $F[2] >= 1000 && $F[2] < 60000' $i >> $i.originst
+    perl -naF: -e 'print if $F[2] > 1000 && $F[2] < 60000' $i >> $i.originst
     mv $i.originst $i
 done
 
@@ -70,6 +70,7 @@ apt-get remove --purge -y --auto-remove network-manager hplip brltty bluez-cups
 rm /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
 
 # restore our network
+killall nm-applet
 ifdown eth0 || true
 ifup eth0
 
@@ -79,7 +80,7 @@ killall apt-get || true
 # install packages from network sources
 apt-get update -o Acquire::Http::No-Cache=true
 
-DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes vim bzrtools python-paramiko patchutils offlineimap wipe gnome-gpg diffstat dchroot gtimelog rsnapshot 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 xchat debmirror dpatch wdiff dhcp3-server grep-dctrl ccache subversion listadmin quilt apache2 python-dev cryptsetup mutt editmoin lintian ia32-libs splix easytag latex-beamer python-gtk2-doc
+DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes vim bzrtools bzr-svn python-paramiko patchutils offlineimap wipe gnome-gpg diffstat dchroot gtimelog rsnapshot 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 xchat debmirror dpatch wdiff dhcp3-server grep-dctrl ccache subversion listadmin quilt apache2 python-dev cryptsetup mutt editmoin lintian ia32-libs splix easytag latex-beamer python-gtk2-doc
 apt-get -y build-dep postgresql-8.2 gnome-volume-manager hal cupsys apport restricted-manager
 
 umount /cdrom