EOF
if [ -n "${BOOT_PARTITION}" ]; then
- echo "${BOOT_PARTITION} /boot auto defaults 0 0" >> ${LFS}/etc/fstab
+ install -v -m755 -d ${LFS}/mnt/boot
+ echo "${BOOT_PARTITION} /mnt/boot auto ${PARTITION_MOUNT_OPTS} 0 0" >> ${LFS}/etc/fstab
fi
if [ -n "${SWAP_PARTITION}" ]; then
echo "${SWAP_PARTITION} none swap sw 0 0" >> ${LFS}/etc/fstab
fi
-echo "${LFS_PARTITION} / auto defaults,noatime 0 0" >> ${LFS}/etc/fstab
+echo "${LFS_PARTITION} / auto ${PARTITION_MOUNT_OPTS} 0 0" >> ${LFS}/etc/fstab
cat >> ${LFS}/etc/fstab << "EOF"
proc /proc proc defaults 0 0
sysfs /sys sysfs defaults 0 0
-tmpfs /run tmpfs defaults 0 0
-tmpfs /tmp tmpfs defaults,mode=1777,size=_TMP_PARTITION_SIZE_ 0 0
+tmpfs /run tmpfs defaults,noatime 0 0
+tmpfs /tmp tmpfs defaults,,noatime,mode=1777,size=_TMP_PARTITION_SIZE_ 0 0
devpts /dev/pts devpts gid=4,mode=620 0 0
shm /dev/shm tmpfs defaults 0 0
LC_CTYPE=C
export PATH MANPATH LANG LC_COLLATE LC_CTYPE PS1 PS2 USER LOGNAME MAIL HISTFILESIZE HISTSIZE HOSTNAME EDITOR CFLAGS CXXFLAGS
+
+for script in /etc/profile.d/*.sh ; do
+ if [ -r ${script} ]; then
+ . ${script}
+ fi
+done
+
EOF
sed -i -e "s!_DEFAULT_EDITOR_!${DEFAULT_EDITOR}!g" ${LFS}/etc/profile
cat > ${LFS}/etc/skel/.bashrc << "EOF"
# ~/.bashrc
-# User specific aliases and functions
+# User bashrc
# This file is executed each time an xterm window
# is started.
. /etc/bashrc
fi
+# Source user aliases
+if [ -f ~/.bash_aliases ]; then
+ . ~/.bash_aliases
+fi
+
+EOF
+
+cat > ${LFS}/etc/skel/.bash_aliases << "EOF"
+# ~/.bash_aliases
+
+# User specific aliases
+
+alias hy='history'
+
+# GIT aliases
+alias gra='git rebase --abort'
+alias grc='git rebase --continue'
+alias gri='git rebase -i'
+alias gca='git commit --amend'
+alias vdc='vd --cached'
+
EOF
# Copy skeleton files to root user directory
echo "${REGUSER}" > ${LFS}/etc/shutdown.allow
# Hostname
-echo "${MACHINE_NAME}.${DOMAIN}" > ${LFS}/etc/hostname
+echo "${MACHINE_NAME}" > ${LFS}/etc/hostname
chmod 644 ${LFS}/etc/hostname
echo "127.0.0.1 localhost ${MACHINE_NAME}" > ${LFS}/etc/hosts