Changeset 50408d5

Timestamp:

10/14/2005 09:57:22 PM (19 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

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

Children:

7990087

Parents:

1f1d6a1

Message:

Added a switch to submmint a real /etc/fstab file.
Some space clean-up.

File:

• jhalfs (modified) (10 diffs)

jhalfs

@@ -38 +38 @@
                                 disables also the build of TCL, Expect
                                 and DejaGNU
-                                
-  --timezone TIMEZONE           set TIMEZONE as the local timezone. If not 
+
+  --timezone TIMEZONE           set TIMEZONE as the local timezone. If not
                                 specified, Europe/London will be used.
 
@@ -47 +47 @@
                                 will be used.
 
+  --fstab FILE                  use FILE as the /etc/fstab file for the
+                                LFS system. If not specified, a default
+                                /etc/fstab file with dummy values is
+                                created.
+
   -C, --kernel-config FILE      use the kernel configuration file specified
                                 in FILE to build the kernel. If not found,
@@ -52 +57 @@
 
   -M, --run-make                run make on the generated Makefile
-  
+
 "
 
@@ -165 +170 @@
         echo -e "\nLook like $1 isn't a valid timezone description."
         echo -e "Verify your selection and the command line.\n"
+        exit 1
+      fi
+      shift
+      ;;
+
+    --fstab )
+      test $# = 1 && eval "$exit_missing_arg"
+      shift
+      if [ -f $1 ] ; then
+        FSTAB=$1
+      else
+        echo -e "\nFile $1 not found. Verify your command line.\n"
         exit 1
       fi
@@ -624 +641 @@
     fi
 
-    # In the mount of kernel filesystems we need to set LFS 
+    # In the mount of kernel filesystems we need to set LFS
     # and not to use chroot.
     if [ ${i:4:6} = "kernfs" ] ; then
@@ -692 +709 @@
     # The filesystems can't be unmounted yet due that the user must
     # to enter to the chroot environment to create the root password,
-    # edit several files and setup Grub,  
+    # edit several files and setup Grub,
     elif echo $i | grep -q "reboot" ; then
        continue
@@ -736 +753 @@
 ) >> $MKFILE.tmp
     fi
-    
+
     # Put in place the kernel .config file
     if [ ${i:4:6} = "kernel" ] ; then
@@ -746 +763 @@
     fi
 
+    # Check if we have a real /etc/fstab file
+    if [ ${i:4:5} = "fstab" ] && [ -n "$FSTAB" ] ; then
+(
+    cat << EOF
+        @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=0??-* \$(LFS)\`\n" >logs/$i && \\
+        cp -v $FSTAB \$(LFS)/etc/fstab >>logs/$i 2>&1 && \\
+        echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=0??-* \$(LFS)\`\n" >>logs/$i
+EOF
+) >> $MKFILE.tmp
+    else
     # Initialize the log an run the script
 (
@@ -754 +781 @@
 EOF
 ) >> $MKFILE.tmp
+    fi
 
     # Remove the build directory except if the package build fails.
@@ -760 +788 @@
     cat << EOF
         @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
-        rm -r \$(LFS)\$(SRC)/\$\$ROOT 
+        rm -r \$(LFS)\$(SRC)/\$\$ROOT
 EOF
 ) >> $MKFILE.tmp