webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-10 09:18:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

installer: add partitions as installation source

Browse Source 
This add compatiblity for rufus usb-keys that convert the
iso to fat or ntfs partition.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2022-01-16 13:46:36 +00:00
parent 14aa983025
commit 68a50dd12d
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/installer/main.c
View File

@@ -415,7 +415,8 @@ int main(int argc, char *argv[]) {
}
// Load common modules
mysystem(logfile, "/sbin/modprobe vfat"); // USB key
mysystem(logfile, "/sbin/modprobe vfat"); // USB key
mysystem(logfile, "/sbin/modprobe ntfs3"); // USB key
hw_stop_all_raid_arrays(logfile);
if (!config.unattended) {
@@ -555,7 +556,10 @@ int main(int argc, char *argv[]) {
assert(sourcedrive);
int r = hw_mount(sourcedrive, SOURCE_MOUNT_PATH, "iso9660", MS_RDONLY);
if (r) {
if (r) r = hw_mount(sourcedrive, SOURCE_MOUNT_PATH, "ntfs3", MS_RDONLY);
if (r) r = hw_mount(sourcedrive, SOURCE_MOUNT_PATH, "vfat", MS_RDONLY);
if (r)
{
snprintf(message, sizeof(message), _("Could not mount %s to %s:\n %s\n"),
sourcedrive, SOURCE_MOUNT_PATH, strerror(errno));
errorbox(message);