From: martin@piware.de <>
Date: Thu, 20 Mar 2008 12:10:46 +0000 (+0100)
Subject: postinst-setup: some bug fixes
X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=commitdiff_plain;h=01b8923984910643d5990aee8fe65a4e0fa71d3e

postinst-setup: some bug fixes
---

diff --git a/postinst-setup b/postinst-setup
index 3b5c151..0c63c53 100755
--- 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