Upgrade to abiword-3.0.0

[hvlinux.git] / stage1 / create-config-files

diff --git a/stage1/create-config-files b/stage1/create-config-files
index 00a5894..b840c67 100755 (executable)
--- 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
@@ -213,10 +213,15 @@ cat > ${LFS}/etc/skel/.bash_aliases << "EOF"
 
 # 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
 
@@ -238,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