X-Git-Url: https://piware.de/gitweb/?a=blobdiff_plain;f=postinst-setup;h=5b72c5d0280b790260e962ef4dc6dc9d417ca461;hb=80076fd3b218a594e248aab049372953b256ecf3;hp=c925be20751ffe992e065ff26427edcdefdc8190;hpb=6d86f983b36a5fd497e96bd9e9802acc389900e7;p=bin.git

diff --git a/postinst-setup b/postinst-setup
index c925be2..5b72c5d 100755
--- a/postinst-setup
+++ b/postinst-setup
@@ -28,14 +28,19 @@ if [ ! -d /etc/.bzr ]; then
     for i in passwd group shadow fstab; do
         [ -e $i.originst ] || cp $i $i.originst
     done
-    [ -e /backup-etc ] || bzr get sftp://martin@piware.de/home/martin/backup/`hostname`-etc /backup-etc
+    [ -e /backup-etc ] || bzr get bzr+ssh://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
+    chmod 640 /etc/shadow
+    chown root:shadow /etc/shadow
+    chmod 700 /etc/ssl/private
+    chmod 640 /etc/ssl/private/ssl-cert-*
+    chown root:ssl-cert /etc/ssl/private/ssl-cert*
 
     # only restore dchroot part into fstab
-    grep -A 200 "^# dchroots" fstab >> fstab.originst || true
+    grep -A 200 "^# sid chroot" fstab >> fstab.originst || true
     mv fstab.originst fstab
 
     # only restore the human users from passwd/group
@@ -75,8 +80,8 @@ rm -f /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
 killall apt-get || true
 apt-get update -o Acquire::Http::No-Cache=true
 
-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 texlive-lang-german python-coverage powertop sane-utils vim-scripts libtemplate-perl kvm
-apt-get -y build-dep postgresql-8.3 gnome-mount hal cups apport jockey
+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 dchroot fakechroot imagemagick pngquant pdfjam easytag rsnapshot texlive-lang-german texlive-latex-extra python-coverage powertop sane-utils vim-scripts libtemplate-perl kvm bzr-buildpackage git-core
+apt-get -y build-dep postgresql-8.4 hal cups apport jockey calibre gvfs
 
 umount /cdrom || true