From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCHv2 04/12] installer: Ensure to always create the /boot directory. Date: Sat, 23 Mar 2024 11:56:21 +0100 Message-ID: <20240323105629.371511-4-stefan.schantl@ipfire.org> In-Reply-To: <20240323105629.371511-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7588287711229092117==" List-Id: --===============7588287711229092117== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Ensure to always create the /boot directory during the mounting of the various created file systems. If the /boot directory does not exist some following mount operations could not be performed correctly and the installation/mounting will fail. Signed-off-by: Stefan Schantl --- src/installer/hw.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/installer/hw.c b/src/installer/hw.c index 4d214c152..969c47508 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -904,10 +904,16 @@ int hw_mount_filesystems(struct hw_destination* dest, c= onst char* prefix) { return r; =20 // boot - if (*dest->part_boot) { - snprintf(target, sizeof(target), "%s%s", prefix, HW_PATH_BOOT); - mkdir(target, S_IRWXU|S_IRWXG|S_IRWXO); + snprintf(target, sizeof(target), "%s%s", prefix, HW_PATH_BOOT); + r =3D mkdir(target, S_IRWXU|S_IRWXG|S_IRWXO); + + if (r) { + hw_umount_filesystems(dest, prefix); =20 + return r; + } + + if (*dest->part_boot) { r =3D hw_mount(dest->part_boot, target, filesystem, 0); if (r) { hw_umount_filesystems(dest, prefix); --=20 2.39.2 --===============7588287711229092117==--