X-Git-Url: https://piware.de/gitweb/?a=blobdiff_plain;f=postinst-setup;h=1d39d99bb9f425dd4195f5adf0b3ba45d9690846;hb=f43cdf08b7615b830c4375dd4fbe716df9044b25;hp=c7ceba295ca19bf39bc8d514d2c8014bb5746874;hpb=2cd79e3abcd749b4718450b908c89efa7dd1ada1;p=bin.git

diff --git a/postinst-setup b/postinst-setup
index c7ceba2..1d39d99 100755
--- a/postinst-setup
+++ b/postinst-setup
@@ -1,5 +1,11 @@
 #!/bin/sh -e
 
+# move backup to /var
+if [ -d /home/martin/backup ] && [ ! -d /var/backups/martin ]; then
+    cp -a /home/martin/backup /var/backups/martin
+    rm -rf /home/martin/backup
+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
@@ -17,11 +23,14 @@ fi
 # completely
 cd /etc
 if [ ! -d /etc/.bzr ]; then
-    rsync -r martin@piware.de:backup/desktop-etc/.bzr .
     for i in passwd group shadow fstab; do
         cp $i $i.originst
     done
-    bzr revert --no-backup
+    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
+    chmod 600 /etc/ssh/ssh_*_key
 fi
 
 # only restore dchroot part into fstab
@@ -45,6 +54,7 @@ newaliases
 # copy apt cache
 if [ -d /home/aptcache ]; then
     find /home/aptcache/ -name "*.deb" -exec cp '{}' /var/cache/apt/archives/ \;
+    rm -rf /home/aptcache
 fi
 
 # other setup
@@ -69,17 +79,20 @@ 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 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
 # m h  dom mon dow   command
-05 * * * * $HOME/bin/backup
+05 * * * * \$HOME/bin/backup >/dev/null
 EOF