Mount boot partition in /mnt/boot instead of /boot

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

diff --git a/stage1/create-config-files b/stage1/create-config-files
index 8ea1c5b..8fa08ce 100755 (executable)
--- a/stage1/create-config-files
+++ b/stage1/create-config-files
@@ -9,7 +9,8 @@ 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 defaults 0 0" >> ${LFS}/etc/fstab
 fi
 if [ -n "${SWAP_PARTITION}" ]; then
     echo "${SWAP_PARTITION} none swap sw 0 0" >> ${LFS}/etc/fstab
@@ -19,10 +20,16 @@ echo "${LFS_PARTITION}  /                 auto defaults,noatime 0 0" >> ${LFS}/e
 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
 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"
@@ -67,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.
@@ -78,7 +85,10 @@ 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
 EOF
 
 sed -i -e "s!_DEFAULT_EDITOR_!${DEFAULT_EDITOR}!g" ${LFS}/etc/profile
@@ -107,9 +117,6 @@ alias fgrep='fgrep --color=auto'
 alias egrep='egrep --color=auto'
 alias less='less -RFX'
 
-# Pour avoir un environnement similaire à ce qu'un login fournirait:
-alias su='su --login'
-
 # Pour que la touche BACKSPACE fonctionne correctement lorsque Bash nous
 # demande une confirmation (quand on veut effacer un fichier par exemple).
 if tty --quiet ; then
@@ -130,12 +137,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