r3800 - jhalfs/trunk/CLFS

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Wed Jun 4 12:55:51 PDT 2014


Author: pierre
Date: Wed Jun  4 12:55:51 2014
New Revision: 3800

Log:
CLFS puts fstab in config and not anymore in bootable.
Thanks to Chris Staub for the report.

Modified:
   jhalfs/trunk/CLFS/master.sh

Modified: jhalfs/trunk/CLFS/master.sh
==============================================================================
--- jhalfs/trunk/CLFS/master.sh	Fri May 30 23:57:41 2014	(r3799)
+++ jhalfs/trunk/CLFS/master.sh	Wed Jun  4 12:55:51 2014	(r3800)
@@ -731,6 +731,8 @@
     case $this_script in
       *udev)     continue ;; # This is not a script but a commentary, we want udev-rules
       *console*) continue ;; # Use the files that came with the bootscripts
+# fstab is now here (for 3.x.y)
+      *fstab)  [[ ! -z ${FSTAB} ]] && cp ${FSTAB} $BUILDDIR/sources/fstab ;;
       *)  ;;
     esac
 
@@ -771,7 +773,16 @@
       CHROOT_Unpack "$pkg_tarball"
     fi
     #
-    CHROOT_wrt_RunAsRoot "${file}"
+    case $this_script in
+      *fstab*)   if [[ -n "$FSTAB" ]]; then
+                   CHROOT_wrt_CopyFstab
+                 else
+                   CHROOT_wrt_RunAsRoot  "${file}"
+                 fi
+        ;;
+      *) CHROOT_wrt_RunAsRoot "${file}"
+        ;;
+    esac
     #
     # Write installed files log and remove the build directory(ies)
     # except if the package build fails.


More information about the alfs-log mailing list