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

diff --git a/stage1/create-config-files b/stage1/create-config-files
index bf8780c..633376e 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
@@ -52,7 +42,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.
@@ -82,7 +72,7 @@ LANG="en_US.UTF-8"
 # followed by names beginning with lower-case letters. But  if
 # 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_COLLATE=C
 ################# LC_ALL=POSIX
 
 export PATH MANPATH LANG LC_COLLATE PS1 PS2 USER LOGNAME MAIL HISTFILESIZE HISTSIZE HOSTNAME EDITOR CFLAGS CXXFLAGS
@@ -90,6 +80,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