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

diff --git a/config/httpd/ssl-global.conf b/config/httpd/ssl-global.conf
index 458339add4eb734fb72f1be292825e37d994fce3..9cf4f8150bd133a5076c7587983a5ed1ca62f8ce 100644 (file)
--- 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 3e2f3f08865f932782b98b5d69cfcd1c7e51d2e9..77e1eabbdc94f95d564173d14fa2504034992fd1 100644 (file)
--- 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");
            }