projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deplace alsa au stage3.
[hvlinux.git]
/
stage1
/
create-config-files
diff --git
a/stage1/create-config-files
b/stage1/create-config-files
index
1dad392
..
781bb94
100755
(executable)
--- a/
stage1/create-config-files
+++ b/
stage1/create-config-files
@@
-1,10
+1,6
@@
-#!/bin/sh
-set -o errexit
+#!/bin/bash
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
+source ../functions/main
echo "Creating /etc/fstab"
cat > ${LFS}/etc/fstab << "EOF"
echo "Creating /etc/fstab"
cat > ${LFS}/etc/fstab << "EOF"
@@
-13,16
+9,20
@@
cat > ${LFS}/etc/fstab << "EOF"
EOF
if [ -n "${BOOT_PARTITION}" ]; then
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
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
+echo "${LFS_PARTITION} /
auto
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
/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
proc /proc proc defaults 0 0
sysfs /sys sysfs defaults 0 0
devpts /dev/pts devpts gid=4,mode=620 0 0
@@
-32,7
+32,7
@@
EOF
echo "Creating basic /etc/profile and /etc/profile.d"
install -v -m755 -d ${LFS}/etc/profile.d
cat > ${LFS}/etc/profile << "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/
ba
sh
# /etc/profile
# System-wide environment and startup programs.
# /etc/profile
# System-wide environment and startup programs.
@@
-48,7
+48,7
@@
HISTFILESIZE=1000
HISTSIZE=1000
HOSTNAME=`hostname`
EDITOR=_DEFAULT_EDITOR_
HISTSIZE=1000
HOSTNAME=`hostname`
EDITOR=_DEFAULT_EDITOR_
-CFLAGS="
-pipe -O2
"
+CFLAGS="
_DEFAULT_CFLAGS_
"
CXXFLAGS=${CFLAGS}
# Set default permissions when creating new files.
CXXFLAGS=${CFLAGS}
# Set default permissions when creating new files.
@@
-86,9
+86,11
@@
EOF
sed -i -e "s!_DEFAULT_EDITOR_!${DEFAULT_EDITOR}!g" ${LFS}/etc/profile
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"
echo "Creating /etc/bashrc"
cat > ${LFS}/etc/bashrc << "EOF"
-#!/bin/sh
+#!/bin/
ba
sh
# /etc/bashrc
# /etc/bashrc