Changeset a5e3400 for common/common-functions

Timestamp:

02/18/2007 12:37:10 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

3cb432a0

Parents:

e4f732c

Message:

Fixed clean_buildir function to handle properly dev, proc, and sys directories.

File:

• common/common-functions (modified) (2 diffs)

common/common-functions

@@ -13 +13 @@
 ${tab_}${tab_}${BOLD}${RED}W A R N I N G${OFF}
     Looks like the \$BUILDDIR directory contains subdirectories
-    from a previous HLFS build.
+    from a previous build.
 
     Please format the partition mounted on \$BUILDDIR or set
@@ -53 +53 @@
       echo "Looks like $BUILDDIR was not populated by a previous jhalfs run."
       exit 1
+    # Test that dev filesystems are not mounted in $BUILDDIR
+    elif mount | grep $BUILDDIR/dev > /dev/null ; then
+      echo "Looks like kernel fylesystems are yet mounted on $BUILDDIR."
+      exit 1
     else
       # Clean the build directory
       echo -n "Cleaning $BUILDDIR ..."
-      sudo rm -rf $BUILDDIR/{bin,boot,etc,home,lib,media,mnt,opt,root,sbin,srv,tmp,tools,cross-tools,usr,var}
+      # First delete proc and sys directories, if exit.
+      # Both should be empty, if not be sure to exit.
+      if [ -d $BUILDDIR/proc ] ; then
+        sudo rmdir $BUILDDIR/proc || exit 1
+      fi
+      if [ -d $BUILDDIR/sys ] ; then
+        sudo rmdir $BUILDDIR/sys || exit 1
+      fi
+      sudo rm -rf $BUILDDIR/{bin,boot,dev,etc,home,lib,media,mnt,opt,root,sbin,srv,tmp,tools,cross-tools,usr,var}
       echo "done"
       echo -n "Cleaning $JHALFSDIR ..."