Merge branche make

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

diff --git a/stage1/create-config-files b/stage1/create-config-files
index 2c782fa..36596ba 100755 (executable)
--- a/stage1/create-config-files
+++ b/stage1/create-config-files
@@ -1,9 +1,9 @@
 #!/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"
@@ -19,9 +19,14 @@ if [ -n "${SWAP_PARTITION}" ]; then
 fi
 echo "${LFS_PARTITION}  /                 reiserfs defaults,noatime 0 0" >> ${LFS}/etc/fstab
 
-cat >> ${LFS}/etc/fstab << "EOF"
+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
+
+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
@@ -47,7 +52,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.
@@ -85,6 +90,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