X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage1%2Fcreate-config-files;h=38153bbda1c1183c5748fcc567299eb36690f337;hb=496fe638ddb82977bb02578cc9e1c39ffcc8c41e;hp=36596bac30755ffb9e7ec59c20ab08d8c3c24a4b;hpb=f920c7ef750f2163b9e407cc453b192ede2c185a;p=hvlinux.git

diff --git a/stage1/create-config-files b/stage1/create-config-files
index 36596ba..38153bb 100755
--- a/stage1/create-config-files
+++ b/stage1/create-config-files
@@ -1,9 +1,6 @@
 #!/bin/bash
 
-# Reading system configuration informations, functions and package versions.
-source ../config/sysinfos
-source ../functions
-source ../config/packages-list
+source ../functions/main
 
 echo "Creating /etc/fstab"
 cat > ${LFS}/etc/fstab << "EOF"
@@ -12,25 +9,21 @@ cat > ${LFS}/etc/fstab << "EOF"
 EOF
 
 if [ -n "${BOOT_PARTITION}" ]; then
-    echo "${BOOT_PARTITION} /boot ext2 defaults 1 1" >> ${LFS}/etc/fstab
+    echo "${BOOT_PARTITION} /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
 fi
-echo "${LFS_PARTITION}  /                 reiserfs defaults,noatime 0 0" >> ${LFS}/etc/fstab
-
-if [ -n "${CDROM}" ]; then
-    cat >> ${LFS}/etc/fstab << "EOF"
-/dev/cdrom        /media/cdrom      auto     ro,noauto,users  0 0
-/dev/dvd          /media/dvd        auto     ro,noauto,users  0 0
-EOF
-fi
+echo "${LFS_PARTITION}  /                 auto defaults,noatime 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
 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
 
 echo "Creating basic /etc/profile and /etc/profile.d"
@@ -48,11 +41,15 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/tools/bin:/tools/sbin
 USER=`id -un`
 LOGNAME=$USER
 MAIL="/var/mail/$USER"
-HISTFILESIZE=1000
+
+# Don't put duplicate lines in the history.
+HISTCONTROL=ignoredups:ignorespace
+HISTFILESIZE=2000
 HISTSIZE=1000
+
 HOSTNAME=`hostname`
 EDITOR=_DEFAULT_EDITOR_
-CFLAGS=_DEFAULT_CFLAGS_
+CFLAGS="_DEFAULT_CFLAGS_"
 CXXFLAGS=${CFLAGS}
 
 # Set default permissions when creating new files.
@@ -73,7 +70,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.
@@ -83,9 +80,11 @@ LANG="en_US.UTF-8"
 # LC_COLLATE equals en_US.ISO8859-1, then leading dots as well
 # as case are ignored in determining the sort order.
 LC_COLLATE=C
-################# LC_ALL=POSIX
 
-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,8 +106,18 @@ alias cp='cp -i'
 alias df='df -h'
 alias du='du -h -s'
 # --show-control-chars is for seeing international characters in filenames
-alias ls='ls -h --color=auto --show-control-chars'
+alias ls='ls -h --color=auto --show-control-chars --time-style=long-iso'
 eval $(dircolors --sh /etc/DIR_COLORS)
+alias grep='grep --color=auto'
+alias fgrep='fgrep --color=auto'
+alias egrep='egrep --color=auto'
+alias less='less -RFX'
+
+# 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
+    stty erase '^H'
+fi
 
 # For some unknown reason bash refuses to inherit PS1 in some circumstances
 # that I can't figure out. Putting PS1 here ensures that it gets loaded every
@@ -132,39 +141,9 @@ else
 fi
 EOF
 
-echo "Installing /etc/DIR_COLORS"
-install -m644 ${SCRDIR}/misc/DIR_COLORS ${LFS}/etc/DIR_COLORS
-
-echo "Creating /etc/inputrc"
-cat > ${LFS}/etc/inputrc << "EOF"
-# Begin /etc/inputrc
-
-# Enable 8bit input
-set meta-flag On
-set input-meta On
-# Turns off 8th bit stripping
-set convert-meta Off
-# Keep the 8th bit for display
-set output-meta On
-
-# none, visible or audible
-set bell-style none
-
-# All of the following map the escape sequence of the value contained inside
-# the 1st argument to the readline specific functions
-"\eOd": backward-word
-"\eOc": forward-word
-# for linux console
-"\e[1~": beginning-of-line
-"\e[4~": end-of-line
-"\e[5~": beginning-of-history
-"\e[6~": end-of-history
-"\e[3~": delete-char
-"\e[2~": quoted-insert
-# for xterm
-"\eOH": beginning-of-line
-"\eOF": end-of-line
-EOF
+install -v -m644 ${SCRDIR}/misc/DIR_COLORS ${LFS}/etc
+
+install -v -m644 ${SCRDIR}/misc/inputrc ${LFS}/etc
 
 cat >> ${LFS}/etc/modules << "EOF"
 # /etc/modules: kernel modules to load at boot time.
@@ -222,6 +201,10 @@ cat > ${LFS}/etc/shells << "EOF"
 EOF
 chmod 644 ${LFS}/etc/shells
 
+# This file contains a list of users (1 per line) who are allowed to shutdown
+# the computer. This doesn't mean that these users can invoke the shutdown
+# (or reboot or halt) command(s). Instead, it means that an authorized user
+# can shut down the computer by pressing ctrl+alt+del.
 echo "Creating /etc/shutdown.allow"
 echo "${REGUSER}" > ${LFS}/etc/shutdown.allow