Date: Mon, 18 Nov 2002 12:23:01 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 21234 for review Message-ID: <200211182023.gAIKN1aU016095@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=21234 Change 21234 by jhb@jhb_laptop on 2002/11/18 12:22:35 Merge over some changes needed for IA64 releases so Marcel can cut the DP2 release. Affected files ... .. //depot/releng/5_dp2/src/release/ia64/boot_crunch.conf#4 integrate .. //depot/releng/5_dp2/src/usr.sbin/sysinstall/install.c#6 integrate Differences ... ==== //depot/releng/5_dp2/src/release/ia64/boot_crunch.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.2 2002/11/14 01:36:04 marcel Exp $ +# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.3 2002/11/18 08:32:45 marcel Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -12,8 +12,8 @@ srcdirs /usr/src/sbin progs dhclient fsck_ffs ifconfig -progs mount_nfs newfs newfs_msdos route rtsol -progs tunefs +progs mount_msdosfs mount_nfs newfs newfs_msdos +progs route rtsol tunefs srcdirs /usr/src/usr.bin progs find minigzip sed ==== //depot/releng/5_dp2/src/usr.sbin/sysinstall/install.c#6 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/install.c,v 1.332 2002/11/14 01:46:20 marcel Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/install.c,v 1.333 2002/11/18 08:37:46 marcel Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -1046,12 +1046,27 @@ } #if defined(__ia64__) else if (c1->type == efi && c1->private_data) { + char bootdir[FILENAME_MAX]; + char efi_bootdir[FILENAME_MAX]; PartInfo *pi = (PartInfo *)c1->private_data; if (pi->newfs && (!upgrade || !msgNoYes("You are upgrading - are you SURE you want to newfs /dev/%s?", c1->name))) command_shell_add(pi->mountpoint, "%s %s/dev/%s", pi->newfs_cmd, RunningAsInit ? "/mnt" : "", c1->name); command_func_add(pi->mountpoint, Mount, c1->name); + + /* + * Create a directory boot on the EFI filesystem and create a + * link boot on the root filesystem pointing to the one on the + * EFI filesystem. That way, we install the loader, kernel + * and modules on the EFI filesystem. + */ + sprintf(bootdir, "%s", RunningAsInit ? "/mnt" : ""); + sprintf(efi_bootdir, "%s/%s", bootdir, pi->mountpoint); + strcat(bootdir, "/boot"); + strcat(efi_bootdir, "/boot"); + Mkdir(efi_bootdir); + symlink(efi_bootdir, bootdir); } #endif } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-releng" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211182023.gAIKN1aU016095>