Author: pierre
Date: Fri Mar 10 12:23:57 2017
New Revision: 3906
Log:
Fix logic for copying fstab. That stupid bug wanted to copy fstab when
FSTAB was empty!
Modified:
jhalfs/trunk/CLFS/master.sh
jhalfs/trunk/LFS/master.sh
Modified: jhalfs/trunk/CLFS/master.sh
==============================================================================
--- jhalfs/trunk/CLFS/master.sh Sun Mar 5 10:28:03 2017 (r3905)
+++ jhalfs/trunk/CLFS/master.sh Fri Mar 10 12:23:57 2017 (r3906)
@@ -378,7 +378,7 @@
*grub | *aboot | *colo | *silo | *arcload | *lilo | *introduction )
continue ;;
*how-to-view*) continue ;;
*whatnext*) continue ;;
- *fstab) [[ ! -z ${FSTAB} ]] &&
+ *fstab) [[ -z "${FSTAB}" ]] ||
[[ ${FSTAB} == $BUILDDIR/sources/fstab ]] ||
cp ${FSTAB} $BUILDDIR/sources/fstab ;;
*kernel) # if there is no kernel config file do not build the kernel
@@ -499,7 +499,7 @@
*changingowner) wrt_RunAsRoot "${file}" ;;
*devices) wrt_RunAsRoot "${file}" ;;
*fstab)
- if [[ -n "$FSTAB" ]]; then
+ if [[ -n "${FSTAB}" ]]; then
LUSER_wrt_CopyFstab
else
LUSER_wrt_RunAsUser "${file}"
@@ -734,10 +734,10 @@
this_script=`basename $file`
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 ;;
*) ;;
@@ -912,7 +912,7 @@
# A little housekeeping on the scripts
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 ;;
*kernel) # if there is no kernel config file do not build the kernel
Modified: jhalfs/trunk/LFS/master.sh
==============================================================================
--- jhalfs/trunk/LFS/master.sh Sun Mar 5 10:28:03 2017 (r3905)
+++ jhalfs/trunk/LFS/master.sh Fri Mar 10 12:23:57 2017 (r3906)
@@ -312,7 +312,7 @@
# If no .config file is supplied, the kernel build is skipped
case ${this_script} in
*grub) continue ;;
- *fstab) [[ ! -z ${FSTAB} ]] &&
+ *fstab) [[ -z "${FSTAB}" ]] ||
[[ ${FSTAB} == $BUILDDIR/sources/fstab ]] ||
cp ${FSTAB} $BUILDDIR/sources/fstab ;;
*kernel) [[ -z ${CONFIG} ]] && continue
@@ -366,7 +366,7 @@
# Check if we have a real /etc/fstab file
case "${this_script}" in
- *fstab) if [[ -n $FSTAB ]]; then
+ *fstab) if [[ -n "$FSTAB" ]]; then
CHROOT_wrt_CopyFstab
else
CHROOT_wrt_RunAsRoot "$file"
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
