Ignore:
Timestamp:
04/09/2017 10:29:32 AM (7 years ago)
Author:
Pierre Labastie <pierre@…>
Branches:
ablfs-more, legacy, trunk
Children:
cee84ad
Parents:
909ee37
Message:

Merge the new_features branch (manully, thanks to svn)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • common/libs/func_validate_configs.sh

    r909ee37 r945ccaa  
    4242
    4343  # Build Settings by book
    44   local -r   LFS_build="$BUILD_chroot VIMLANG $BUILD_common PKGMNGT FULL_LOCALE"
     44  local -r   LFS_build="$BUILD_chroot VIMLANG $BUILD_common PKGMNGT FULL_LOCALE WRAP_INSTALL"
    4545  local -r  HLFS_build="$BUILD_chroot         $BUILD_common"
    4646  local -r  CLFS_build="$BUILD_chroot VIMLANG $BUILD_common"
     
    4848  local -r CLFS3_build="                      $BUILD_common"
    4949
     50  # System Settings by book (only LFS for now)
     51  local -r LFS_system="HOSTNAME INTERFACE IP_ADDR GATEWAY PREFIX BROADCAST DOMAIN DNS1 DNS2 FONT CONSOLE_MAP UNICODE KEYMAP"
     52
    5053  # Full list of books settings
    51   local -r   lfs_PARAM_LIST="$LFS_book   $GENERAL_common $LFS_build   $ADVANCED_chroot $ADVANCED_common"
     54  local -r   lfs_PARAM_LIST="$LFS_book   $GENERAL_common $LFS_build $LFS_system  $ADVANCED_chroot $ADVANCED_common"
    5255  local -r  hlfs_PARAM_LIST="$HLFS_book  $GENERAL_common $HLFS_build  $ADVANCED_chroot $ADVANCED_common"
    5356  local -r  clfs_PARAM_LIST="$CLFS_book  $GENERAL_common $CLFS_build  $ADVANCED_chroot $ADVANCED_common"
     
    194197               ;;
    195198
     199        # Treatment of HOSTNAME
     200      HOSTNAME)  echo -e "`eval echo $PARAM_VALS`"
     201                 [[ "${!config_param}" = "**EDIT ME**" ]] && write_error_and_die
     202                 ;;
     203
    196204        # Case of PKGMNGT: two files, packageManager.xml and packInstall.sh
    197205        # must exist in $PKGMNGTDIR if PKGMNGT='y':
Note: See TracChangeset for help on using the changeset viewer.