1 files changed, 60 insertions, 0 deletions
diff --git a/env.sh b/env.sh
index 1e91ff6..837942a 100644
--- a/env.sh
+++ b/env.sh
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/bin/bash
 
 # Begin book environment settings
@@ -55,3 +56,62 @@ export TESTERUID
 # Features of this build system won't like vt100/vt220 and some others.
 # Set to xterm
 TERM="xterm"
+=======
+#!/bin/bash
+
+# Begin book environment settings
+PS1='\u:\w\$ '
+set +h
+umask 022
+
+LFS="/mnt/lfs"
+LC_ALL="POSIX"
+LFS_TGT="$(uname -m)"-lfs-linux-gnu
+PATH=/usr/bin
+if [[ ! -L /bin ]]; then PATH="/bin:${PATH}"; fi
+PATH="${LFS}/tools/bin:${PATH}"
+CONFIG_SITE="${LFS}/usr/share/config.site"
+# End book environment settings
+
+# LFS Version being built
+LFS_VER="LFS_10_1"
+
+# Disk where LFS partition will exist / or exists
+LFS_DISK="/dev/sdb"
+
+# Partition number where LFS will exist / or exists
+LFS_PART="1"
+
+# Filesystem to use for LFS
+LFS_FS="EXT4"
+
+# Swap device to use for LFS
+LFS_SWAP="/dev/sda2"
+
+# LFS User password (not used at this time)
+LFS_PWD="lfs"
+
+# Get number of online processors
+NUMPROCS="$(getconf _NPROCESSORS_ONLN)"
+numjobs="$((NUMPROCS * 2 - 1))"
+# Make flags for multiple jobs
+MAKEFLAGS="-j${numjobs}"
+NINJAJOBS="${NUMPROCS}"
+
+unset numjobs
+
+# Set spinner type (0-12 in funtions.sh)
+SPINNER="0"
+
+
+TESTERUID="$(id -u)" \
+
+export PS1 LC_ALL LFS LFS_TGT PATH CONFIG_SITE
+export LFS_VER LFS_DISK LFS_FS LFS_PART LFS_PWD NUMPROCS MAKEFLAGS NINJAJOBS
+export SPINNER
+export TESTERUID
+
+# Features of this build system won't like vt100/vt220 and some others.
+# Set to xterm
+TERM="xterm"
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28