-# install users
-cat <<EOF >> /etc/passwd
-joe:x:1001:1001:Joe User,,,:/home/joe:/bin/bash
-netti:x:1002:1002:Annett Kittel,,,:/home/netti:/bin/bash
-EOF
-cat <<EOF >> /etc/shadow
-joe:$1$7t1pZTyL$lI7.B/9DtPa6y2BD8wTNZ/:13060:0:99999:7:::
-netti:$1$5uq6X7u0$92yOfMH2Nh89Ui.hbaEDp/:12930:0:99999:7:::
-EOF
-cat <<EOF >> /etc/group
-joe:x:1001:
-netti:x:1002:
-EOF
+# restore /etc bzr branch, rescue the files we do not want to restore
+# completely
+cd /etc
+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 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 "^# sid chroot" fstab >> fstab.originst || true
+ mv fstab.originst fstab