X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage1%2Fcreate-config-files;h=b0ef07ce38b7b4c495ed1ea3fe7f99ea2cacb9f4;hb=9e9a9c06d74ed4281c347ae1e5ade74909b5d2d2;hp=bf8780c8a3615f7c572e39ba6c0c79ac581618fb;hpb=2ad910e22979500192ea43d5599ad003440744a4;p=hvlinux.git

diff --git a/stage1/create-config-files b/stage1/create-config-files
index bf8780c..b0ef07c 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,19 +9,12 @@ 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
@@ -48,11 +38,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="-pipe -O2"
+CFLAGS="_DEFAULT_CFLAGS_"
 CXXFLAGS=${CFLAGS}
 
 # Set default permissions when creating new files.
@@ -83,13 +77,14 @@ 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
 EOF
 
 sed -i -e "s!_DEFAULT_EDITOR_!${DEFAULT_EDITOR}!g" ${LFS}/etc/profile
 
+sed -i -e "s!_DEFAULT_CFLAGS_!-pipe -O2 ${MARCH_FLAGS}!g" ${LFS}/etc/profile
+
 echo "Creating /etc/bashrc"
 cat > ${LFS}/etc/bashrc << "EOF"
 #!/bin/bash
@@ -107,6 +102,13 @@ alias du='du -h -s'
 # --show-control-chars is for seeing international characters in filenames
 alias ls='ls -h --color=auto --show-control-chars'
 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 avoir un environnement similaire à ce qu'un login fournirait:
+alias su='su --login'
 
 # 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
@@ -130,8 +132,7 @@ else
 fi
 EOF
 
-echo "Installing /etc/DIR_COLORS"
-install -m644 ${SCRDIR}/misc/DIR_COLORS ${LFS}/etc/DIR_COLORS
+install -v -m644 ${SCRDIR}/misc/DIR_COLORS ${LFS}/etc/DIR_COLORS
 
 echo "Creating /etc/inputrc"
 cat > ${LFS}/etc/inputrc << "EOF"
@@ -220,6 +221,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