From 12da26912033f758ae59bbbef18f68c2ba9ca350 Mon Sep 17 00:00:00 2001 From: "John P. Davis" Date: Tue, 6 Apr 2004 05:31:37 +0000 Subject: [PATCH] fix for dev problem git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@346 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 ++++- targets/stage1/stage1-chroot.sh | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 282e11ac..f25e5f71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.38 2004/04/05 20:31:43 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.39 2004/04/06 05:31:37 zhen Exp $ + + 06 Apr 2004; John Davis targets/stage1/stage1-chroot.sh: + fix for /dev in stage1 05 Apr 2004; John Davis modules/targets.py: bugfix for #46861 diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index 233fc1aa..11635bc4 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -43,10 +43,10 @@ case $1 in USE="-* build" emerge ${EMERGE_OPTS} --noreplace $x || exit 1 done - if [ ! -d /dev ] + if [ ! -d ${ROOT}/dev ] then - mkdir -p /dev - cd /dev + mkdir -p ${ROOT}/dev + cd ${ROOT}/dev MAKEDEV generic-i386 fi ;; @@ -59,7 +59,7 @@ case $1 in if [ -e /usr/sbin/gcc-config ] then mythang=\$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* ) - gcc-config \${mythang}; env-update; source /etc/profile + gcc-config \${mythang}; /usr/sbin/env-update; source /etc/profile fi #stage1 is not going to have anything in zoneinfo, so save our Factory timezone rm -f /etc/localtime -- 2.26.2