X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage1%2Fcreate-config-files;h=b840c67c688fe15ac140102a1d985e2f8022aa9e;hb=3a7d016a0246156de63a6f98bbf5be2e95230060;hp=b2067499547d21393e3c9505113f244b2bef1255;hpb=ebb3ccd22206eaaa88726cce4a9bd13f0ae27a2b;p=hvlinux.git

diff --git a/stage1/create-config-files b/stage1/create-config-files
index b206749..b840c67 100755
--- a/stage1/create-config-files
+++ b/stage1/create-config-files
@@ -10,12 +10,12 @@ EOF
 
 if [ -n "${BOOT_PARTITION}" ]; then
     install -v -m755 -d ${LFS}/mnt/boot
-    echo "${BOOT_PARTITION} /mnt/boot auto defaults,noatime 0 0" >> ${LFS}/etc/fstab
+    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
@@ -89,6 +89,13 @@ LC_COLLATE=C
 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
@@ -185,7 +192,7 @@ EOF
 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.
 
@@ -194,6 +201,28 @@ if [ -f /etc/bashrc ]; then
 	. /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'
+alias gitk='gitk --all'
+
 EOF
 
 # Copy skeleton files to root user directory
@@ -214,7 +243,7 @@ echo "Creating /etc/shutdown.allow"
 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