diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2008-09-06 21:57:46 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2008-09-06 21:57:46 +0000 |
commit | b9c529eba696b62117fe9809220f57abdfaa80e8 (patch) | |
tree | 001aa9f1ab8e8068764e400e1949c47366e9184e | |
parent | 557784d2f557445086832a73398d889c570b9bfb (diff) | |
download | pfsense-b9c529eba696b62117fe9809220f57abdfaa80e8.zip pfsense-b9c529eba696b62117fe9809220f57abdfaa80e8.tar.gz |
It is now technically possible to cvssync livecd for testing :)
-rw-r--r-- | etc/phpshellsessions/cvssync | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/cvssync index b1df1e0..5fae2e1 100644 --- a/etc/phpshellsessions/cvssync +++ b/etc/phpshellsessions/cvssync @@ -92,7 +92,7 @@ if(!$found) { exit; } -if($branch == "RESTORE") { +if($branch == "RESTORE" && $g['platform'] == "pfSense") { if(!file_exists("/root/cvssync_backup.tgz")) { echo "Sorry, we could not find a previous CVSSync backup file.\n"; exit(); @@ -101,6 +101,8 @@ if($branch == "RESTORE") { exec("tar Uxpf /root/cvssync_backup.tgz -C /"); post_cvssync_commands(); exit(); +} else { + $nobackup = true; // do not backup embedded, livecd } if(!$nobackup) { @@ -143,7 +145,11 @@ exec("rm -f ${CODIR}/pfSense/etc/syslog.conf 2>/dev/null"); echo "===> Installing new files...\n"; -exec("cd $CODIR/pfSense ; tar -cpf - . | (cd / ; tar -Uxpf -)"); +if($g['platform'] == "pfSense") + $command = "cd $CODIR/pfSense ; tar -cpf - . | (cd / ; tar -Uxpf -)"; +else + $command = "cd $CODIR/pfSense ; tar -cpf - . | (cd / ; tar -xpf -)"; +exec($command); post_cvssync_commands(); |