From owner-freebsd-current@FreeBSD.ORG Tue Nov 16 13:01:47 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F607106566B for ; Tue, 16 Nov 2010 13:01:47 +0000 (UTC) (envelope-from bu7cher@yandex.ru) Received: from forward1.mail.yandex.net (forward1.mail.yandex.net [77.88.46.6]) by mx1.freebsd.org (Postfix) with ESMTP id 30A258FC14 for ; Tue, 16 Nov 2010 13:01:46 +0000 (UTC) Received: from smtp4.mail.yandex.net (smtp4.mail.yandex.net [77.88.46.104]) by forward1.mail.yandex.net (Yandex) with ESMTP id 645946F60051; Tue, 16 Nov 2010 16:01:45 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1289912505; bh=ev8ClHZXhuBwFeAuzm9BDWumLFFAYZCx0jN99WMp9Bg=; h=Message-ID:Date:From:MIME-Version:To:CC:Subject:References: In-Reply-To:Content-Type; b=KarWMsBJD9dq7Qus9oX/3+V2UGLF0DG4ZE9A6ykDKm64revoCONWEEsedQnvoqRTI Q4iTezh9urIhxnNUmtcs2ZTRd1zcrvdOdSFXEFR+TEdTe4V5xRZgerX7XjADHNEh/d BfS1BWCUC5uGj5M/kOOKJQ6fddFT6ZSyTlzTcU+U= Received: from [127.0.0.1] (mail.kirov.so-cdu.ru [77.72.136.145]) by smtp4.mail.yandex.net (Yandex) with ESMTPSA id E5B311280A6; Tue, 16 Nov 2010 16:01:44 +0300 (MSK) Message-ID: <4CE280B7.1070502@yandex.ru> Date: Tue, 16 Nov 2010 16:01:43 +0300 From: "Andrey V. Elsukov" User-Agent: Mozilla Thunderbird 1.5 (FreeBSD/20051231) MIME-Version: 1.0 To: Adrian Chadd References: In-Reply-To: X-Enigmail-Version: 1.1.1 Content-Type: multipart/mixed; boundary="------------060308000204010909070501" Cc: Bruce Cran , freebsd-hackers@freebsd.org, freebsd-current Subject: Re: breaking the crunchgen logic into a share/mk file X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Nov 2010 13:01:47 -0000 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--