X-Git-Url: https://piware.de/gitweb/?a=blobdiff_plain;f=postinst-setup;h=1ffb93786e82968c0e76525ef00eecfd32843fe9;hb=9b89b39402aa65d5252164ada05f74ec4ada4dca;hp=754661f81ea1e6fd55554d93b674632319b1aa62;hpb=238ba3bf105c031c609a540104595be83c70f188;p=bin.git

diff --git a/postinst-setup b/postinst-setup
index 754661f..1ffb937 100755
--- a/postinst-setup
+++ b/postinst-setup
@@ -8,7 +8,7 @@ fi
 
 # install already shipped debs
 [ -e /mirror ] || ln -s /home/ubuntu-mirror /mirror
-mount -o loop /home/martin/download/ubuntu/gutsy-alternate-amd64.iso /cdrom
+mount -o loop /home/martin/download/ubuntu/hardy-alternate-amd64.iso /cdrom
 apt-cdrom -m add
 DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential fakeroot devscripts postfix openssh-server bzr
 
@@ -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,12 +39,12 @@ 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
 
 # only restore some passwords from shadow
-egrep 'martin|netti|test|joe' shadow >> shadow.originst
+egrep 'martin|netti|joe' shadow >> shadow.originst
 mv shadow.originst shadow
 
 # update postfix for new configuration
@@ -64,28 +65,27 @@ locale-gen ru_RU ru_RU.UTF-8
 killall apt-get || true
 
 # remove packages that we do not need
-apt-get remove --purge -y --auto-remove network-manager hplip brltty bluez-cups gnome-accessibility-themes gnome-mag gnome-orca onboard tomboy ttf-arabeyes ttf-arphic-ukai ttf-arphic-uming ttf-baekmuk ttf-gentium ttf-indic-fonts ttf-kochi-gothic ttf-kochi-mincho ttf-lao ttf-malayalam-fonts ttf-mgopen ttf-thai-tlwg
+apt-get purge -y --auto-remove hplip brltty bluez-cups gnome-accessibility-themes gnome-mag gnome-orca onboard tomboy ttf-arabeyes ttf-arphic-uming ttf-baekmuk ttf-gentium ttf-kochi-gothic ttf-kochi-mincho ttf-lao ttf-malayalam-fonts ttf-mgopen ttf-thai-tlwg
 
 rm /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
 
-# restore our network
-ifdown eth0 || true
-ifup eth0
-
 # cronjob goo
 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
-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 weechat weechat-plugins weechat-scripts dpatch wdiff dhcp3-server grep-dctrl ccache subversion listadmin quilt apache2 python-dev cryptsetup mutt editmoin lintian ia32-libs easytag latex-beamer python-gtk2-doc
+apt-get -y build-dep postgresql-8.3 gnome-volume-manager hal cupsys apport jockey
+
+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