Enlevé entrées cdrom et DVD dans fstab si la variable CDROM n'est pas initialisée

[hvlinux.git] / stage1 / create-config-files

diff --git a/stage1/create-config-files b/stage1/create-config-files
index 0bc590c..108504f 100755 (executable)
--- a/stage1/create-config-files
+++ b/stage1/create-config-files
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -o errexit
 
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
@@ -20,9 +19,14 @@ if [ -n "${SWAP_PARTITION}" ]; then
 fi
 echo "${LFS_PARTITION}  /                 reiserfs defaults,noatime 0 0" >> ${LFS}/etc/fstab
 
-cat >> ${LFS}/etc/fstab << "EOF"
+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
+
+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