r3147 - in jhalfs/trunk: CLFS CLFS2 HLFS LFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Oct 2 12:38:35 PDT 2006


Author: manuel
Date: 2006-10-02 13:38:34 -0600 (Mon, 02 Oct 2006)
New Revision: 3147

Modified:
   jhalfs/trunk/CLFS/master.sh
   jhalfs/trunk/CLFS2/master.sh
   jhalfs/trunk/HLFS/master.sh
   jhalfs/trunk/LFS/master.sh
Log:
Removed obsolete restart code from all books.
A better approach need be developed.

Modified: jhalfs/trunk/CLFS/master.sh
===================================================================
--- jhalfs/trunk/CLFS/master.sh	2006-10-02 19:32:06 UTC (rev 3146)
+++ jhalfs/trunk/CLFS/master.sh	2006-10-02 19:38:34 UTC (rev 3147)
@@ -1335,10 +1335,6 @@
 (
  cat << EOF
 
-
-restart:
-	@echo "This feature does not exist for the CLFS makefile. (yet)"
-
 restore-luser-env:
 	@\$(call echo_message, Building)
 	@if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\

Modified: jhalfs/trunk/CLFS2/master.sh
===================================================================
--- jhalfs/trunk/CLFS2/master.sh	2006-10-02 19:32:06 UTC (rev 3146)
+++ jhalfs/trunk/CLFS2/master.sh	2006-10-02 19:38:34 UTC (rev 3147)
@@ -499,9 +499,6 @@
 ROOT:	$chowning
 
 
-restart:
-	@echo "This feature does not exist for the CLFS-2 makefile. (yet)"
-
 restore-luser-env:
 	@\$(call echo_message, Building)
 	@if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\

Modified: jhalfs/trunk/HLFS/master.sh
===================================================================
--- jhalfs/trunk/HLFS/master.sh	2006-10-02 19:32:06 UTC (rev 3146)
+++ jhalfs/trunk/HLFS/master.sh	2006-10-02 19:38:34 UTC (rev 3147)
@@ -614,8 +614,6 @@
 BOOT:	$chapter7
 
 
-#restart: restart_code all
-
 restore-luser-env:
 	@\$(call echo_message, Building)
 	@if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
@@ -641,47 +639,8 @@
 		rm -rf /home/\$(LUSER); \\
 	fi;
 
-restart_code:
-	@echo ">>> This feature is experimental, BUGS may exist"
 
-	@if [ ! -L /tools ]; then \\
-	  echo -e "\\nERROR::\\n /tools is NOT a symlink.. /tools must point to \$(MOUNT_PT)/tools\\n" && false;\\
-	fi;
 
-	@if [ ! -e /tools ]; then \\
-	  echo -e "\\nERROR::\\nThe target /tools points to does not exist.\\nVerify the target.. \$(MOUNT_PT)/tools\\n" && false;\\
-	fi;
-
-	@if ! stat -c %N /tools | grep "\$(MOUNT_PT)/tools" >/dev/null ; then \\
-	  echo -e "\\nERROR::\\nThe symlink \\"/tools\\" does not point to \\"\$(MOUNT_PT)/tools\\".\\nCorrect the problem and rerun\\n" && false;\\
-	fi;
-
-	@if [ -f ???-kernfs ]; then \\
-	  mkdir -pv \$(MOUNT_PT)/{proc,sys};\\
-	  if !  mount -l | "\$(MOUNT_PT)/dev" >/dev/null ; then \\
-	    mount -vt ramfs ramfs \$(MOUNT_PT)/dev;\\
-	  fi;\\
-	  if [ ! -e \$(MOUNT_PT)/dev/console ]; then \\
-	    mknod -m 600 \$(MOUNT_PT)/dev/console c 5 1;\\
-	  fi;\\
-	  if [ ! -e \$(MOUNT_PT)/dev/null ]; then \\
-	    mknod -m 666 \$(MOUNT_PT)/dev/null c 1 3;\\
-	  fi;\\
-	  if ! mount -l | grep "\$(MOUNT_PT)/dev/pts" >/dev/null ; then \\
-	    mount -vt devpts -o gid=4,mode=620 devpts \$(MOUNT_PT)/dev/pts;\\
-	  fi;\\
-	  if ! mount -l | grep "\$(MOUNT_PT)/dev/shm" >/dev/null ; then \\
-	    mount -vt tmpfs shm \$(MOUNT_PT)/dev/shm;\\
-	  fi;\\
-	  if ! mount -l | grep "\$(MOUNT_PT)/proc" >/dev/null ; then \\
-	    mount -vt proc proc \$(MOUNT_PT)/proc;\\
-	  fi;\\
-	  if ! mount -l | grep "\$(MOUNT_PT)/sys" >/dev/null ; then \\
-	    mount -vt sysfs sysfs \$(MOUNT_PT)/sys;\\
-	  fi;\\
-	fi;
-
-
 EOF
 ) >> $MKFILE
 

Modified: jhalfs/trunk/LFS/master.sh
===================================================================
--- jhalfs/trunk/LFS/master.sh	2006-10-02 19:32:06 UTC (rev 3146)
+++ jhalfs/trunk/LFS/master.sh	2006-10-02 19:38:34 UTC (rev 3147)
@@ -498,8 +498,6 @@
 BOOT:	$chapter789
 
 
-restart: restart_code all
-
 restore-luser-env:
 	@\$(call echo_message, Building)
 	@if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
@@ -525,46 +523,7 @@
 		rm -rf /home/\$(LUSER); \\
 	fi;
 
-restart_code:
-	@echo ">>> This feature is experimental, BUGS may exist"
 
-	@if [ ! -L /tools ]; then \\
-	  echo -e "\\nERROR::\\n /tools is NOT a symlink.. /tools must point to \$(MOUNT_PT)/tools\\n" && false;\\
-	fi;
-
-	@if [ ! -e /tools ]; then \\
-	  echo -e "\\nERROR::\\nThe target /tools points to does not exist.\\nVerify the target.. \$(MOUNT_PT)/tools\\n" && false;\\
-	fi;
-
-	@if ! stat -c %N /tools | grep "\$(MOUNT_PT)/tools" >/dev/null ; then \\
-	  echo -e "\\nERROR::\\nThe symlink \\"/tools\\" does not point to \\"\$(MOUNT_PT)/tools\\".\\nCorrect the problem and rerun\\n" && false;\\
-	fi;
-
-	@if [ -f ???-kernfs ]; then \\
-	  mkdir -pv \$(MOUNT_PT)/{dev,proc,sys};\\
-	  if [ ! -e \$(MOUNT_PT)/dev/console ]; then \\
-	    mknod -m 600 \$(MOUNT_PT)/dev/console c 5 1;\\
-	  fi;\\
-	  if [ ! -e \$(MOUNT_PT)/dev/null ]; then \\
-	    mknod -m 666 \$(MOUNT_PT)/dev/null c 1 3;\\
-	  fi;\\
-	  if !  mount -l | grep bind >/dev/null ; then \\
-	    mount --bind /dev \$(MOUNT_PT)/dev;\\
-	  fi;\\
-	  if ! mount -l | grep "\$(MOUNT_PT)/dev/pts" >/dev/null ; then \\
-	    mount -vt devpts devpts \$(MOUNT_PT)/dev/pts;\\
-	  fi;\\
-	  if ! mount -l | grep "\$(MOUNT_PT)/dev/shm" >/dev/null ; then \\
-	    mount -vt tmpfs shm \$(MOUNT_PT)/dev/shm;\\
-	  fi;\\
-	  if ! mount -l | grep "\$(MOUNT_PT)/proc" >/dev/null ; then \\
-	    mount -vt proc proc \$(MOUNT_PT)/proc;\\
-	  fi;\\
-	  if ! mount -l | grep "\$(MOUNT_PT)/sys" >/dev/null ; then \\
-	    mount -vt sysfs sysfs \$(MOUNT_PT)/sys;\\
-	  fi;\\
-	fi;
-
 EOF
 ) >> $MKFILE
 




More information about the alfs-log mailing list