webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-20 16:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

installer: Fix download of the ISO image

Browse Source
This commit is contained in:
Michael Tremer
2014-11-05 01:34:27 +01:00
parent 69749af100
commit 3e1145e1a0
2 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/installer/downloadsource.sh
View File

@@ -31,6 +31,15 @@ fi
OUTPUT="${1}"
URL="${2}"
# Mount a tmpfs which is big enough to hold the ISO image
OUTPUT_DIR="${OUTPUT%/*}"
mkdir -p "${OUTPUT_DIR}"
if ! mount -t tmpfs none "${OUTPUT_DIR}" -o size=512M; then
echo "Could not mount tmpfs to ${OUTPUT_DIR}" >&2
exit 1
fi
echo "Downloading ${URL}..."
if ! download -O "${OUTPUT}" "${URL}"; then
echo "Download failed" >&2

40
src/installer/main.c
View File

@@ -25,7 +25,7 @@
#define INST_FILECOUNT 21000
#define LICENSE_FILE "/cdrom/COPYING"
#define SOURCE_TEMPFILE "/tmp/downloaded-image.iso"
#define SOURCE_TEMPFILE "/tmp/downloads/image.iso"
extern char url[STRING_SIZE];
@@ -502,7 +502,7 @@ int main(int argc, char *argv[]) {
FILE* f = fopen(SOURCE_TEMPFILE, "r");
if (f) {
sourcedrive = SOURCE_TEMPFILE;
sourcedrive = strdup(SOURCE_TEMPFILE);
fclose(f);
} else {
char reason[STRING_SIZE] = "-";
@@ -849,6 +849,18 @@ int main(int argc, char *argv[]) {
// Umount source drive and eject
hw_umount(SOURCE_MOUNT_PATH);
// Free downloaded ISO image
if (strcmp(sourcedrive, SOURCE_TEMPFILE) == 0) {
rc = unlink(sourcedrive);
if (rc)
fprintf(flog, "Could not free downloaded ISO image: %s\n", sourcedrive);
// or eject real images
} else {
snprintf(commandstring, STRING_SIZE, "/usr/bin/eject %s", sourcedrive);
mysystem(logfile, commandstring);
}
// Download and execute the postinstall script
if (*config.postinstall) {
snprintf(commandstring, sizeof(commandstring),
@@ -860,9 +872,6 @@ int main(int argc, char *argv[]) {
}
}
snprintf(commandstring, STRING_SIZE, "/usr/bin/eject %s", sourcedrive);
mysystem(logfile, commandstring);
if (!config.unattended) {
snprintf(message, sizeof(message), _(
"%s was successfully installed!\n\n"
@@ -886,19 +895,28 @@ EXIT:
newtFinished();
// Free resources
free(system_release);
free(roottext);
free(helpline);
if (system_release)
free(system_release);
free(sourcedrive);
free(destination);
if (roottext)
free(roottext);
if (helpline)
free(helpline);
if (sourcedrive)
free(sourcedrive);
if (destination)
free(destination);
hw_stop_all_raid_arrays(logfile);
if (selected_disks)
hw_free_disks(selected_disks);
hw_free(hw);
if (hw)
hw_free(hw);
fcloseall();