# HG changeset patch # User Pascal Bellard # Date 1300268331 -3600 # Node ID ed56bd5b4622fa4f2a7a4e5fd5f73ef9c26158f4 # Parent aa9358196db914e30f1735cc925c61315f3686e8 backuppc: fix FSH diff -r aa9358196db9 -r ed56bd5b4622 backuppc/receipt --- a/backuppc/receipt Wed Mar 16 10:03:27 2011 +0100 +++ b/backuppc/receipt Wed Mar 16 10:38:51 2011 +0100 @@ -22,6 +22,10 @@ { cd $src mkdir -p _pkg/etc/apache/conf.d + grep -q share/BackupPC/doc configure.pl || + sed -i -e 's|/doc|/share/BackupPC/doc|' \ + -e 's|bin doc|bin share/BackupPC/doc|' \ + configure.pl perl configure.pl --batch --dest-dir=$PWD/_pkg --install-dir=/usr \ --data-dir=/var/lib/BackupPC --config-dir=/etc/BackupPC \ --log-dir=/var/log/BackupPC --backuppc-user=www \ @@ -39,7 +43,7 @@ sed -i -e "s/''http/'http/;s/min''/min'/" \ -e 's/-E -N -d/-E -d/' \ -e "s/^\\\$Conf{CgiAdminUsers}.*/\$Conf{CgiAdminUsers} = 'root';/" \ - -e 's|sshPath -q -x|sshPath -i /etc/BackupPC/.ssh/id_rsa -q -x|' \ + -e 's|sshPath -q -x|sshPath -o UserKnownHostsFile=/etc/BackupPC/.ssh/known_hosts -i /etc/BackupPC/.ssh/id_rsa -q -x|' \ $fs/etc/BackupPC/config.pl chown www.www $fs/etc/BackupPC/config.pl chmod 755 $fs/etc $fs/var $fs/var/*