Changeset 796cd28 for install-blfs-tools.sh

Timestamp:

03/02/2017 04:40:34 PM (8 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

new_features

Children:

a9dadcf

Parents:

eb8667a

Message:

Merge trunk rev 3896:
Unless explicitely set on the command line, the REV parameter
in BLFS tools make is the same as the preceding used one. Formerly, it
was set to sysv unless defined on the command line

File:

• install-blfs-tools.sh (modified) (4 diffs)

install-blfs-tools.sh

@@ -12 +12 @@
 BLFS_BRANCH_ID: development, branch-xxx, xxx (where xxx is a valid tag)
                 (default development)
+INIT_SYSTEM   : which book do you want? 'sysv' or 'systemd' (default sysv)
 Examples:
 1 - If you plan to use the tools to build BLFS on top of LFS, but you did not
 use jhalfs, or forgot to include the jhalfs-blfs tools:
 (as root) mkdir -p /var/lib/jhalfs/BLFS && chown -R <user> /var/lib/jhalfs
-(as user) ./install-blfs-tools.sh
-2 - To install with only user privileges:
+(as user) INIT_SYSTEM=<your system> ./install-blfs-tools.sh
+2 - To install with only user privileges (default to sysv):
 TRACKING_DIR=$HOME/blfs_root/trackdir ./install-blfs-tools.sh
 inline_doc
@@ -57 +58 @@
 BLFS_ROOT="${BLFS_ROOT:=/blfs_root}"
 TRACKING_DIR="${TRACKING_DIR:=/var/lib/jhalfs/BLFS}"
+INIT_SYSTEM="${INIT_SYSTEM:=sysv}"
 
 [[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}"
@@ -91 +93 @@
 cp README.BLFS ${BUILDDIR}${BLFS_ROOT}
 [[ $VERBOSITY > 0 ]] && echo "... OK"
-[[ $VERBOSITY > 0 ]] && echo -n Cleaning the ${BUILDDIR}${BLFS_ROOT} directory
 
 # Clean-up
+[[ $VERBOSITY > 0 ]] && echo Cleaning the ${BUILDDIR}${BLFS_ROOT} directory
 make -C ${BUILDDIR}${BLFS_ROOT}/menu clean
 rm -rf ${BUILDDIR}${BLFS_ROOT}/libs/.svn
@@ -113 +115 @@
 [[ $VERBOSITY > 0 ]] && echo "... OK"
 
-[[ $VERBOSITY > 0 ]] && echo -n "Downloading and validating the book (may take some time)"
+[[ $VERBOSITY > 0 ]] && echo "Downloading and validating the book (may take some time)"
 make -j1 -C $BUILDDIR$BLFS_ROOT \
      TRACKING_DIR=$TRACKING_DIR \
+     REV=$INIT_SYSTEM            \
      SVN=svn://svn.linuxfromscratch.org/BLFS/$BLFS_TREE \
      $BUILDDIR$BLFS_ROOT/packages.xml