postinst-setup: some bug fixes

diff --git a/postinst-setup b/postinst-setup
index 3b5c15187dd7481fa016b59b58fe4c66acbbf8e7..0c63c53f467c6da0a4fdbe44344978cfecb97e33 100755 (executable)
--- a/postinst-setup
+++ b/postinst-setup
@@ -15,7 +15,7 @@ fi
 DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential fakeroot devscripts postfix openssh-server bzr
 
 # root's ssh stuff
-if [ ! -d /root/ssh ] && [ -d /home/martin/.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/
@@ -26,7 +26,7 @@ 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/`hostname`-etc /backup-etc
     cp -av /backup-etc/* /etc/
@@ -36,7 +36,7 @@ if [ ! -d /etc/.bzr ]; then
 fi
 
 # only restore dchroot part into fstab
-grep -A 200 "^# dchroots" fstab >> fstab.originst
+grep -A 200 "^# dchroots" fstab >> fstab.originst || true
 mv fstab.originst fstab
 
 # only restore the human users from passwd/group