Date: Tue, 16 Nov 2010 16:01:43 +0300 From: "Andrey V. Elsukov" <bu7cher@yandex.ru> To: Adrian Chadd <adrian@freebsd.org> Cc: Bruce Cran <bruce@cran.org.uk>, freebsd-hackers@freebsd.org, freebsd-current <freebsd-current@freebsd.org> Subject: Re: breaking the crunchgen logic into a share/mk file Message-ID: <4CE280B7.1070502@yandex.ru> In-Reply-To: <AANLkTi=nGL%2BryTST6CmACy0p-Eoj5yYL3BXKjs8pYKvy@mail.gmail.com> References: <AANLkTi=BwHge47xnQa39cERXhoTnFGW0HqCYkHLgnnbQ@mail.gmail.com> <AANLkTi=nGL%2BryTST6CmACy0p-Eoj5yYL3BXKjs8pYKvy@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------060308000204010909070501 Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 7bit On 08.11.2010 15:31, Adrian Chadd wrote: >> I've broken out the crunchgen logic from src/rescue/rescue into a >> share/mk file - that way it can be reused in other areas. >> >> The diff is here: http://people.freebsd.org/~adrian/crunchgen-mk.diff<; >> http://people.freebsd.org/%7Eadrian/crunchgen-mk.diff>; >> >> This bsd.crunchgen.mk file is generic enough to use in my >> busybox-style thing as well as for src/rescue/rescue/. >> >> Comments, feedback, etc welcome! It seems this broke usage of livefs from sysinstall. sysinstall does check for /rescue/ldconfig and can not find it there. I think attached patch can fix this issue (not tested). -- WBR, Andrey V. Elsukov --------------060308000204010909070501 Content-Type: text/plain; name="sysinstall_rescue.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="sysinstall_rescue.diff" Index: head/usr.sbin/sysinstall/install.c =================================================================== --- head/usr.sbin/sysinstall/install.c (revision 215396) +++ head/usr.sbin/sysinstall/install.c (working copy) @@ -342,7 +342,7 @@ installFixitUSB(dialogMenuItem *self) !DEVICE_INIT(mediaDevice)) { msgConfirm("No USB devices found!"); return (DITEM_FAILURE); - } else if (!file_readable("/dist/rescue/ldconfig")) { + } else if (!file_readable("/dist/rescue/rescue")) { msgConfirm("Unable to find a FreeBSD live filesystem."); return (DITEM_FAILURE); } @@ -375,7 +375,7 @@ installFixitCDROM(dialogMenuItem *self) mediaClose(); if (need_eject && msgYesNo("Unable to mount the disc. Do you want to try again?") != 0) return DITEM_FAILURE; - } else if (!file_readable("/dist/rescue/ldconfig")) { + } else if (!file_readable("/dist/rescue/rescue")) { mediaClose(); if (need_eject && msgYesNo("Unable to find a FreeBSD live filesystem. Do you want to try again?") != 0) @@ -565,7 +565,7 @@ fixit_livefs_common(dialogMenuItem *self) /* Generate a new ld.so.hints */ if (!file_readable("/var/run/ld.so.hints")) { Mkdir("/var/run"); - if (vsystem("/mnt2/rescue/ldconfig -s /mnt2/lib " + if (vsystem("/mnt2/rescue/rescue ldconfig -s /mnt2/lib " "/mnt2/usr/lib")) { msgConfirm("Warning: ldconfig could not create the " "ld.so hints file.\nDynamic executables from the " --------------060308000204010909070501--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4CE280B7.1070502>