projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ajout support pour archives xz, et ajout fonction pour vérifier qu'on est bien l...
[hvlinux.git]
/
stage1
/
create-config-files
diff --git
a/stage1/create-config-files
b/stage1/create-config-files
index
bf8780c
..
32c6399
100755
(executable)
--- a/
stage1/create-config-files
+++ b/
stage1/create-config-files
@@
-1,9
+1,6
@@
#!/bin/bash
#!/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"
echo "Creating /etc/fstab"
cat > ${LFS}/etc/fstab << "EOF"
@@
-12,19
+9,12
@@
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
-
-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
cat >> ${LFS}/etc/fstab << "EOF"
proc /proc proc defaults 0 0
@@
-52,7
+42,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.
@@
-83,13
+73,14
@@
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_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
sed -i -e "s!_DEFAULT_EDITOR_!${DEFAULT_EDITOR}!g" ${LFS}/etc/profile
export PATH MANPATH LANG LC_COLLATE PS1 PS2 USER LOGNAME MAIL HISTFILESIZE HISTSIZE HOSTNAME EDITOR CFLAGS CXXFLAGS
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
echo "Creating /etc/bashrc"
cat > ${LFS}/etc/bashrc << "EOF"
#!/bin/bash