Changeset d601cfc for CLFS/master.sh

Timestamp:

03/10/2017 08:23:57 PM (7 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, trunk

Children:

abc276c

Parents:

3d24e5b

Message:

Fix logic for copying fstab. That stupid bug wanted to copy fstab when
FSTAB was empty!

File:

• CLFS/master.sh (modified) (4 diffs)

CLFS/master.sh

@@ -379 +379 @@
       *how-to-view*) continue  ;;
       *whatnext*) continue     ;;
-      *fstab)   [[ ! -z ${FSTAB} ]] &&
+      *fstab)   [[ -z "${FSTAB}" ]] ||
                 [[ ${FSTAB} == $BUILDDIR/sources/fstab ]] ||
                 cp ${FSTAB} $BUILDDIR/sources/fstab ;;
@@ -500 +500 @@
         *devices)         wrt_RunAsRoot "${file}"    ;;
         *fstab)
-           if [[ -n "$FSTAB" ]]; then
+           if [[ -n "${FSTAB}" ]]; then
                LUSER_wrt_CopyFstab
            else
@@ -735 +735 @@
 
     case $this_script in
-      *udev)     continue ;; # This is not a script but a commentary, we want udev-rules
+      *udev)     continue ;; # This is not a script but a comment, 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} ]] &&
+      *fstab)  [[ -z "${FSTAB}" ]] ||
                [[ ${FSTAB} == $BUILDDIR/sources/fstab ]] ||
                cp ${FSTAB} $BUILDDIR/sources/fstab ;;
@@ -913 +913 @@
     case $this_script in
       *grub | *aboot | *colo | *silo | *arcload | *lilo | *reboot* )  continue ;;
-      *fstab)  [[ ! -z ${FSTAB} ]] &&
+      *fstab)  [[ -z "${FSTAB}" ]] ||
                [[ ${FSTAB} == $BUILDDIR/sources/fstab ]] ||
                cp ${FSTAB} $BUILDDIR/sources/fstab ;;