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

diff --git a/stage1/create-config-files b/stage1/create-config-files
index bf8780c..4d41939 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"
@@ -19,9 +16,8 @@ if [ -n "${SWAP_PARTITION}" ]; then
 fi
 echo "${LFS_PARTITION}  /                 reiserfs defaults,noatime 0 0" >> ${LFS}/etc/fstab
 
-if [ -n "${CDROM}" ]; then
+if [ "x${DVDROM}" = "xyes" ]; 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
@@ -52,7 +48,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.
@@ -90,6 +86,8 @@ 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