r3112 - in jhalfs/branches/experimental: CLFS HLFS LFS

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Wed Sep 13 17:14:38 PDT 2006


Author: georgeb
Date: 2006-09-13 18:14:37 -0600 (Wed, 13 Sep 2006)
New Revision: 3112

Modified:
   jhalfs/branches/experimental/CLFS/master.sh
   jhalfs/branches/experimental/HLFS/master.sh
   jhalfs/branches/experimental/LFS/master.sh
Log:
Correct bug which occurs when restarting chroot phase

Modified: jhalfs/branches/experimental/CLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS/master.sh	2006-09-13 20:30:00 UTC (rev 3111)
+++ jhalfs/branches/experimental/CLFS/master.sh	2006-09-14 00:14:37 UTC (rev 3112)
@@ -1224,10 +1224,12 @@
 
 #---------------CHROOT JAIL
 mk_SYSTOOLS: mk_SUDO 
-	@mkdir \$(MOUNT_PT)/bin && \\
-	cd \$(MOUNT_PT)/bin && \\
-	ln -sf /tools/bin/bash bash; ln -sf bash sh
-	@sed -e 's|^ln -sv|ln -svf|' -i \$(CMDSDIR)/chroot/082-createfiles
+	@if [ ! -e \$(MOUNT_PT)/bin ]; then \\
+	  mkdir \$(MOUNT_PT)/bin; \\
+	  cd \$(MOUNT_PT)/bin && \\
+	  ln -svf /tools/bin/bash bash; ln -sf bash sh; \\
+	fi;
+	@sudo sed -e 's|^ln -sv|ln -svf|' -i \$(CMDSDIR)/chroot/082-createfiles
 	@\$(call echo_CHROOT_request)
 	@\$(call echo_PHASE, Chroot systools)
 	@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make SYSTOOLS")

Modified: jhalfs/branches/experimental/HLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/HLFS/master.sh	2006-09-13 20:30:00 UTC (rev 3111)
+++ jhalfs/branches/experimental/HLFS/master.sh	2006-09-14 00:14:37 UTC (rev 3112)
@@ -584,10 +584,12 @@
 	@touch \$@
 	
 mk_CHROOT: mk_SUDO 
-	@mkdir \$(MOUNT_PT)/bin && \
-	cd \$(MOUNT_PT)/bin && \
-	ln -sf /tools/bin/bash bash; ln -sf bash sh
-	@sed -e 's|^ln -vs|ln -svf|' -i \$(CMDSDIR)/chapter06/064-createfiles
+	@if [ ! -e \$(MOUNT_PT)/bin ]; then \\
+	  mkdir \$(MOUNT_PT)/bin; \\
+	  cd \$(MOUNT_PT)/bin && \\
+	  ln -sf /tools/bin/bash bash; ln -sf bash sh; \\
+	fi;
+	@sudo sed -e 's|^ln -sv|ln -svf|' -i $(CMDSDIR)/chapter06/064-createfiles
 	@\$(call echo_CHROOT_request)
 	@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")
 	@touch \$@

Modified: jhalfs/branches/experimental/LFS/master.sh
===================================================================
--- jhalfs/branches/experimental/LFS/master.sh	2006-09-13 20:30:00 UTC (rev 3111)
+++ jhalfs/branches/experimental/LFS/master.sh	2006-09-14 00:14:37 UTC (rev 3112)
@@ -467,11 +467,13 @@
 # Also change the original symlink creation to include (f)orce to prevent failure due to
 #  pre-existing links.
 #
-mk_CHROOT: mk_LUSER
-	@mkdir \$(MOUNT_PT)/bin && \\
-	cd \$(MOUNT_PT)/bin && \\
-	ln -sf /tools/bin/bash bash; ln -sf bash sh
-	@sed -e 's|^ln -sv|ln -svf|' -i \$(CMDSDIR)/chapter06/063-createfiles
+mk_CHROOT: mk_SUDO
+	@if [ ! -e \$(MOUNT_PT)/bin ]; then \\
+	  mkdir \$(MOUNT_PT)/bin; \\
+	  cd \$(MOUNT_PT)/bin && \\
+	  ln -sf /tools/bin/bash bash; ln -sf bash sh; \\
+	fi;
+	@sudo sed -e 's|^ln -sv|ln -svf|' -i \$(CMDSDIR)/chapter06/063-createfiles
 	@\$(call echo_CHROOT_request)
 	@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")
 	@sudo restore-luser-env




More information about the alfs-log mailing list