Enlevé création répertoires dvd et cd dans /media et entrées dans fstab car les cd...

diff --git a/config/sysinfos.default b/config/sysinfos.default
index 166910112bfd0bcd71a2bc484da32e6a927f2489..ed94581d108da3c7366520912e5d7d8eed6d0c8b 100644 (file)
--- a/config/sysinfos.default
+++ b/config/sysinfos.default
@@ -38,9 +38,6 @@ MAIL_ADMIN=""
 # X.org driver (comment to build all drivers)
 #XORG_VIDEO_DRIVER="intel"
 
-# Removable media drives. Comment if your system doesn't have one (default yes)
-DVDROM="yes"
-
 # Sound card support: yes or no
 SOUND_CARD="yes"
 

diff --git a/config/sysinfos.hp-mini b/config/sysinfos.hp-mini
index 45613d86d68351ca432834bec35b323e06145d78..ea1faf1aadd5dfa42cd45684dfb88d1c61d872ee 100644 (file)
--- a/config/sysinfos.hp-mini
+++ b/config/sysinfos.hp-mini
@@ -23,9 +23,6 @@ MAIL_ADMIN="hugo"
 
 XORG_VIDEO_DRIVER="intel"
 
-# Removable media drives. Comment if your system doesn't have one.
-DVDROM="no"
-
 WIFI_SUPPORT="yes"
 B43_LPPHY="yes"
 

diff --git a/config/sysinfos.sony-pcgz505 b/config/sysinfos.sony-pcgz505
index 79dbd106cbcefd60204bea48b2d085b08e9299bf..36b2f52b7931bdc6d1ddd963e484b32b25ec4d8d 100644 (file)
--- a/config/sysinfos.sony-pcgz505
+++ b/config/sysinfos.sony-pcgz505
@@ -23,9 +23,6 @@ MAIL_ADMIN="hugo"
 
 XORG_VIDEO_DRIVER="neomagic"
 
-# Removable media drives. Comment if your system doesn't have one.
-DVDROM="no"
-
 WIFI_SUPPORT="yes"
 B43_LPPHY="yes"
 

diff --git a/stage1/create-config-files b/stage1/create-config-files
index 781bb94d3c71fcc0cb0d3807f79dba05f3d9718c..633376e9db80abe5164289d9a35ac08d36239cc0 100755 (executable)
--- a/stage1/create-config-files
+++ b/stage1/create-config-files
@@ -16,12 +16,6 @@ if [ -n "${SWAP_PARTITION}" ]; then
 fi
 echo "${LFS_PARTITION}  /                 auto 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
-
 cat >> ${LFS}/etc/fstab << "EOF"
 proc              /proc             proc     defaults         0 0
 sysfs             /sys              sysfs    defaults         0 0
@@ -78,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

diff --git a/stage1/create-directories b/stage1/create-directories
index 9975857da1d937164d5e79b86a4e4495fb14f132..af761ca66683de56a0b01fb6a1f09dd6beff157c 100755 (executable)
--- a/stage1/create-directories
+++ b/stage1/create-directories
@@ -3,7 +3,7 @@
 source ../functions/main
 
 mkdir -pv ${LFS}/{bin,boot,dev,{etc/,}opt,home,lib,mnt}
-mkdir -pv ${LFS}/{proc,media/{cdrom,dvd},sbin,srv,sys}
+mkdir -pv ${LFS}/{proc,media,sbin,srv,sys}
 mkdir -pv ${LFS}/var/{lock,log,mail,run,spool}
 
 mkdir -pv ${LFS}/var/{opt,cache,lib/{misc,locate},local}