X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage1%2Fcreate-config-files;h=b840c67c688fe15ac140102a1d985e2f8022aa9e;hb=44d3c1f9f0e8fc945206020c4bd7a15c5a457f55;hp=8701bc4aaf888755ebd2f3b4090eb0e125b867cb;hpb=2cc3002af9118793da23987b9c1cef4452b84836;p=hvlinux.git

diff --git a/stage1/create-config-files b/stage1/create-config-files
index 8701bc4..b840c67 100755
--- a/stage1/create-config-files
+++ b/stage1/create-config-files
@@ -9,21 +9,27 @@ cat > ${LFS}/etc/fstab << "EOF"
 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             /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
+
+/dev/dvd        /media/dvd      auto      noauto,ro,users
 EOF
 
+sed -i -e "s!_TMP_PARTITION_SIZE_!${TMP_PARTITION_SIZE}!g" ${LFS}/etc/fstab
+
 echo "Creating basic /etc/profile and /etc/profile.d"
 install -v -m755 -d ${LFS}/etc/profile.d
 cat > ${LFS}/etc/profile << "EOF"
@@ -68,7 +74,7 @@ ulimit -c 0
 
 MANPATH=/usr/share/man:/usr/local/share/man
 
-LANG="en_US.UTF-8"
+LANG="en_US.utf8"
 
 # The sort order of ls output is affected by  the  locale  and
 # can  be  overridden  by the LC_COLLATE environment variable.
@@ -79,7 +85,17 @@ LANG="en_US.UTF-8"
 # as case are ignored in determining the sort order.
 LC_COLLATE=C
 
-export PATH MANPATH LANG LC_COLLATE PS1 PS2 USER LOGNAME MAIL HISTFILESIZE HISTSIZE HOSTNAME EDITOR CFLAGS CXXFLAGS
+# If this is not set, some characters (quotes) are not displayed correctly:
+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
@@ -128,12 +144,13 @@ fi
 if [ "$TERM" = "linux" ]; then
     #we're on the system console or maybe telnetting in
     export PS1="\u(\W)\$"
-    #export PS1="\[\e[32;1m\]\u@\H > \[\e[0m\]"
+elif [ -n "${SSH_CONNECTION}" ]; then
+    export PS1="\[\e]2;[\u]   \w\a\e[33;1m\]ssh \H >\[\e[0m\] "
 else
     #we're not on the console, assume an xterm
-    #export PS1="\[\e]2;\u@\H   \w\a\e[32;1m\]>\[\e[0m\] "
     export PS1="\[\e]2;[\u]   \w\a\e[32;1m\]>\[\e[0m\] "
 fi
+
 EOF
 
 install -v -m644 ${SCRDIR}/misc/DIR_COLORS ${LFS}/etc
@@ -175,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.
 
@@ -184,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
@@ -204,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