X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage1%2Fcreate-config-files;h=f19c0ae0e25796215777e874d047f64bcfe8ee6e;hb=d0ec46d16798fa0b324ee89b712776869bb7efb4;hp=b56c3e8c0604f45c5038e73aa3fb2ba1dceac3f5;hpb=8139fe913bbd64f066246292d0af9362bb7a998e;p=hvlinux.git

diff --git a/stage1/create-config-files b/stage1/create-config-files
index b56c3e8..f19c0ae 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,18 +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 [ "x${DVDROM}" = "xyes" ]; then
-    cat >> ${LFS}/etc/fstab << "EOF"
-/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
@@ -51,7 +42,7 @@ HISTFILESIZE=1000
 HISTSIZE=1000
 HOSTNAME=`hostname`
 EDITOR=_DEFAULT_EDITOR_
-CFLAGS=_DEFAULT_CFLAGS_
+CFLAGS="_DEFAULT_CFLAGS_"
 CXXFLAGS=${CFLAGS}
 
 # Set default permissions when creating new files.
@@ -82,7 +73,6 @@ 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
@@ -131,8 +121,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"
@@ -221,6 +210,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