X-Git-Url: https://piware.de/gitweb/?a=blobdiff_plain;f=postinst-setup;h=190edf5362d35655541163e89fa002fd8b089d26;hb=14926e60444c563260701d3bb680dbf44402b612;hp=4c85d8fc9d10f21727fa3588ecadf63e7de7f4ab;hpb=cb466d88c3809da21638e87093b478771931a281;p=bin.git

diff --git a/postinst-setup b/postinst-setup
index 4c85d8f..190edf5 100755
--- a/postinst-setup
+++ b/postinst-setup
@@ -30,6 +30,7 @@ if [ ! -d /etc/.bzr ]; then
     cp -av /desktop-etc/* /etc/
     cp -av /desktop-etc/.bzr/ /etc/
     rm -rf /desktop-etc
+    chmod 600 /etc/ssh/ssh_*_key
 fi
 
 # only restore dchroot part into fstab
@@ -38,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
 
@@ -69,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
 
@@ -78,14 +80,17 @@ 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
-apt-get -y build-dep postgresql-8.2 gnome-volume-manager hal cupsys apport
+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
 
 # other setup
 ln -s /mirror /var/www/mirror
 ifdown eth1
 ifup eth1
 /etc/init.d/dhcp3-server restart
+patch /usr/bin/gtimelog ~martin/archiv/gtimelog.wednesday.patch
 
 # crontabs
 crontab -u martin - <<EOF