X-Git-Url: https://piware.de/gitweb/?a=blobdiff_plain;f=postinst-setup;h=d06252138bf76b726a833049a3424558dd84acc1;hb=7e7b37df06ff685847154ff1272640da310c63bb;hp=1ffb93786e82968c0e76525ef00eecfd32843fe9;hpb=506bc380965825d7e1981d6c1dd2999f8c14e372;p=bin.git

diff --git a/postinst-setup b/postinst-setup
index 1ffb937..d062521 100755
--- a/postinst-setup
+++ b/postinst-setup
@@ -7,16 +7,18 @@ if [ -d /home/martin/backup ] && [ ! -d /var/backups/martin ]; then
 fi
 
 # install already shipped debs
-[ -e /mirror ] || ln -s /home/ubuntu-mirror /mirror
-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
+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 
 
 # root's ssh stuff
-if [ ! -d /root/ssh ]; then
+if [ ! -d /root/.ssh ] && [ -d /home/martin/.ssh ]; then
     mkdir -p /root/.ssh
     chmod 700 /root/.ssh
-    cp /home/martin/.ssh/id_dsa* /home/martin/.ssh/known_hosts /home/martin/.ssh/config /root/.ssh/
+    cp /home/martin/.ssh/id_rsa* /home/martin/.ssh/known_hosts /home/martin/.ssh/config /root/.ssh/
 fi
 
 # restore /etc bzr branch, rescue the files we do not want to restore
@@ -24,28 +26,30 @@ fi
 cd /etc
 if [ ! -d /etc/.bzr ]; then
     for i in passwd group shadow fstab; do
-        cp $i $i.originst
+        [ -e $i.originst ] || cp $i $i.originst
     done
-    bzr get bzr+ssh://martin@piware.de/home/martin/backup/desktop-etc /desktop-etc
-    cp -av /desktop-etc/* /etc/
-    cp -av /desktop-etc/.bzr/ /etc/
-    rm -rf /desktop-etc
+    [ -e /backup-etc ] || bzr get sftp://martin@piware.de/home/martin/backup/`hostname`-etc /backup-etc
+    cp -av /backup-etc/* /etc/
+    cp -av /backup-etc/.bzr/ /etc/
+    rm -rf /backup-etc
     chmod 600 /etc/ssh/ssh_*_key
-fi
 
-# only restore dchroot part into fstab
-grep -A 200 "^# dchroots" fstab >> fstab.originst
-mv fstab.originst fstab
+    # only restore dchroot part into fstab
+    grep -A 200 "^# dchroots" fstab >> fstab.originst || true
+    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
-    mv $i.originst $i
-done
+    # 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
+        mv $i.originst $i
+    done
 
-# only restore some passwords from shadow
-egrep 'martin|netti|joe' shadow >> shadow.originst
-mv shadow.originst shadow
+    # only restore some passwords from shadow
+    egrep 'martin|netti|joe' shadow >> shadow.originst
+    mv shadow.originst shadow
+    chown root:shadow shadow
+    chmod 640 shadow
+fi
 
 # update postfix for new configuration
 newaliases
@@ -61,34 +65,27 @@ fi
 dpkg -i /home/martin/download/libdvdcss2_*deb || true
 locale-gen ru_RU ru_RU.UTF-8
 
-# cronjob goo
-killall apt-get || true
-
 # remove packages that we do not need
-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
+killall apt-get || true # cronjob goo
+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-lao ttf-thai-tlwg update-motd || true
 
-rm /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
-
-# cronjob goo
-killall apt-get || true
+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
 
-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
+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 gnome-blog dchroot fakechroot imagemagick pngquant pdfjam easytag rsnapshot openvpn texlive-lang-german python-coverage powertop sane-utils
+apt-get -y build-dep postgresql-8.3 gnome-mount hal cups apport jockey
 
-# 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
+umount /cdrom || true
 
 # crontabs
 crontab -u martin - <<EOF
 # m h  dom mon dow   command
 05 * * * * \$HOME/bin/backup >/dev/null
 EOF
+
+if [ -x /usr/bin/gtimelog ]; then
+    patch /usr/bin/gtimelog ~martin/archiv/gtimelog.tuesday.patch
+fi