Changeset 2ee1d11 for LFS/master.sh

Timestamp:

10/07/2006 07:14:47 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

42e1b38

Parents:

f5791f0

Message:

Merged r3147:3173 from trunk.

File:

• LFS/master.sh (modified) (3 diffs)

LFS/master.sh

@@ -499 +499 @@
 
 
-restart: restart_code all
-
 restore-luser-env:
         @\$(call echo_message, Building)
@@ -526 +524 @@
         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
@@ -590 +549 @@
     cat << EOF
         @\$(call echo_CHROOT_request)
-        @ sudo mkdir $BUILDDIR$TRACKING_DIR
+        @ sudo mkdir -p $BUILDDIR$TRACKING_DIR
         @( sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL")
         @touch \$@