X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=sidebyside;f=stage1%2Fcreate-config-files;h=b56c3e8c0604f45c5038e73aa3fb2ba1dceac3f5;hb=0fb786eca497edb316e1dfaa4a4ccec2d6b3f694;hp=1dad392319a02611c6d988a9a0899efde0657860;hpb=afdcc2624aec2f5aaaf00aa211455ba54eaf0703;p=hvlinux.git

diff --git a/stage1/create-config-files b/stage1/create-config-files
index 1dad392..b56c3e8 100755
--- a/stage1/create-config-files
+++ b/stage1/create-config-files
@@ -1,10 +1,9 @@
-#!/bin/sh
-set -o errexit
+#!/bin/bash
 
 # Reading system configuration informations, functions and package versions.
-source ../sysinfos
+source ../config/sysinfos
 source ../functions
-source ../packages-list
+source ../config/packages-list
 
 echo "Creating /etc/fstab"
 cat > ${LFS}/etc/fstab << "EOF"
@@ -20,9 +19,13 @@ if [ -n "${SWAP_PARTITION}" ]; then
 fi
 echo "${LFS_PARTITION}  /                 reiserfs defaults,noatime 0 0" >> ${LFS}/etc/fstab
 
-cat >> ${LFS}/etc/fstab << "EOF"
-/dev/cdrom        /media/cdrom      auto     ro,noauto,users  0 0
+if [ "x${DVDROM}" = "xyes" ]; then
+    cat >> ${LFS}/etc/fstab << "EOF"
 /dev/dvd          /media/dvd        auto     ro,noauto,users  0 0
+EOF
+fi
+
+cat >> ${LFS}/etc/fstab << "EOF"
 proc              /proc             proc     defaults         0 0
 sysfs             /sys              sysfs    defaults         0 0
 devpts            /dev/pts          devpts   gid=4,mode=620   0 0
@@ -32,7 +35,7 @@ EOF
 echo "Creating basic /etc/profile and /etc/profile.d"
 install -v -m755 -d ${LFS}/etc/profile.d
 cat > ${LFS}/etc/profile << "EOF"
-#!/bin/sh
+#!/bin/bash
 # /etc/profile
 
 # System-wide environment and startup programs.
@@ -48,7 +51,7 @@ HISTFILESIZE=1000
 HISTSIZE=1000
 HOSTNAME=`hostname`
 EDITOR=_DEFAULT_EDITOR_
-CFLAGS="-pipe -O2"
+CFLAGS=_DEFAULT_CFLAGS_
 CXXFLAGS=${CFLAGS}
 
 # Set default permissions when creating new files.
@@ -86,9 +89,11 @@ 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/sh
+#!/bin/bash
 
 # /etc/bashrc