Author: justin
Date: 2005-10-05 01:11:54 -0600 (Wed, 05 Oct 2005)
New Revision: 867

Modified:
   branches/utf8-newmake/Makefile
   trunk/Makefile
Log:
Fixed install of passwd and group files (The createfiles target is already in 
chroot, so moved after prep-chroot.)

Modified: branches/utf8-newmake/Makefile
===================================================================
--- branches/utf8-newmake/Makefile      2005-10-05 05:34:11 UTC (rev 866)
+++ branches/utf8-newmake/Makefile      2005-10-05 07:11:54 UTC (rev 867)
@@ -123,6 +123,7 @@
        @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) tools'"
        @touch $(PKG)/wget/.pass2
        @make prep-chroot
+       @install -m644 -oroot -groot $(ROOT)/etc/{group,passwd} $(MP)/etc
        @-mkdir $(MP)/bin
        @if [ ! -f $(MP)/bin/bash ] ; then if [ ! -d $(MP) ] ; then \
         mkdir $(MP)/bin ; fi ; ln -s ${WD}/bin/bash ${MP}/bin/bash ; fi
@@ -299,7 +300,6 @@
        @-$(WD)/bin/ln -s bash /bin/sh
 
 createfiles:
-       @install -m644 -oroot -groot $(ROOT)/etc/{group,passwd} /etc
        @touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
        @chgrp utmp /var/run/utmp /var/log/lastlog
        @chmod 664 /var/run/utmp /var/log/lastlog

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile      2005-10-05 05:34:11 UTC (rev 866)
+++ trunk/Makefile      2005-10-05 07:11:54 UTC (rev 867)
@@ -123,6 +123,7 @@
        @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) tools'"
        @touch $(PKG)/wget/.pass2
        @make prep-chroot
+       @install -m644 -oroot -groot $(ROOT)/etc/{group,passwd} $(MP)/etc
        @-mkdir $(MP)/bin
        @if [ ! -f $(MP)/bin/bash ] ; then if [ ! -d $(MP) ] ; then \
         mkdir $(MP)/bin ; fi ; ln -s ${WD}/bin/bash ${MP}/bin/bash ; fi
@@ -292,7 +293,6 @@
        @-$(WD)/bin/ln -s bash /bin/sh
 
 createfiles:
-       @install -m644 -oroot -groot $(ROOT)/etc/{group,passwd} /etc
        @touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
        @chgrp utmp /var/run/utmp /var/log/lastlog
        @chmod 664 /var/run/utmp /var/log/lastlog

-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to