This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 0cb985d8fc753e7875695f8ac66f9c9db1462636 (commit) via 93dc8835c399eba647112e6d85daf545d8181782 (commit) via 3ae6726a8e15a58a5690ee3a766c68c8d3de67b2 (commit) from 24614d7dfb46bf0ff7fac2f63cfb0d525d82ea95 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 0cb985d8fc753e7875695f8ac66f9c9db1462636 Merge: 93dc883 24614d7 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 26 17:43:18 2011 +0100

Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

commit 93dc8835c399eba647112e6d85daf545d8181782 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 26 17:42:09 2011 +0100

Fix unattended restore of backupiso cd.

commit 3ae6726a8e15a58a5690ee3a766c68c8d3de67b2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jan 26 17:41:15 2011 +0100

Fix ssl-global.conf (settings was ignored).

-----------------------------------------------------------------------

Summary of changes: config/httpd/ssl-global.conf | 9 --------- src/install+setup/install/unattended.c | 2 +- 2 files changed, 1 insertions(+), 10 deletions(-)

Difference in files: diff --git a/config/httpd/ssl-global.conf b/config/httpd/ssl-global.conf index 458339a..9cf4f81 100644 --- a/config/httpd/ssl-global.conf +++ b/config/httpd/ssl-global.conf @@ -13,10 +13,6 @@ # what they do. They're here only as hints or reminders. If you are unsure # consult the online docs. You have been warned.

-# This global SSL configuration is ignored if -# "SSL" is not defined, or if "NOSSL" is defined. -<IfDefine SSL> -<IfDefine !NOSSL> <IfModule mod_ssl.c>

# @@ -61,9 +57,4 @@ SSLRandomSeed startup builtin SSLRandomSeed connect builtin

- SSLLog /var/log/httpd/ssl_engine_log - SSLLogLevel info - </IfModule> -</IfDefine> -</IfDefine> diff --git a/src/install+setup/install/unattended.c b/src/install+setup/install/unattended.c index 3e2f3f0..77e1eab 100644 --- a/src/install+setup/install/unattended.c +++ b/src/install+setup/install/unattended.c @@ -150,7 +150,7 @@ int unattended_setup(struct keyvalue *unattendedkv) { if (strlen(restore_file) > 0) { fprintf(flog, "unattended: Restoring Backup\n"); snprintf(commandstring, STRING_SIZE, - "cd /harddisk && /bin/tar -xvzp -f /harddisk/var/ipfire/backup/%s", restore_file); + "/usr/sbin/chroot /harddisk /bin/tar -xvzp -f /var/ipfire/backup/%s -C /", restore_file); if (mysystem(commandstring)) { errorbox("unattended: ERROR restoring backup"); }

hooks/post-receive -- IPFire 2.x development tree