Ajout dela date au fichier de version

[hvlinux.git] / stage4 / packages-update

diff --git a/stage4/packages-update b/stage4/packages-update
index f8da0ae..2c31259 100755 (executable)
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -21,15 +21,17 @@ for module in ${XORG_MODULES_LIST}; do
 
     if [ "${MOD_NAME}" = "driver" ]; then
        if [ -n "${XORG_VIDEO_DRIVER}" ]; then
-           # Install only specific driver
+           # Install only specified video driver
             for ext in wget md5; do
-                sed -i -e "/xf86-video-${XORG_VIDEO_DRIVER}/!d" ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+                # Comment all xf86-video entries, except for specified driver:
+                sed -e "/xf86-video-${XORG_VIDEO_DRIVER}/!s/\(.*xf86-video.*\)/#\1/" -i ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
             done
        else
-            # Remove unwanted drivers
+            # Install all drivers, except some unwanted drivers
             for ext in wget md5; do
                 for excldrv in vmware newport xgixp geode; do
-                    sed -i -e "/.*xf86-video-${excldrv}.*/d" ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+                    sed -i -e "/.*xf86-video-${excldrv}.*/d" \
+                        ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
                 done
             done
         fi
@@ -50,7 +52,7 @@ for module in ${XORG_MODULES_LIST}; do
 
     pushd ${DEST_DIR} >> ${LFS_LOG_FILE}
     # The "driver" md5 file maybe empty if the nouveau driver was selected
-    if cat ${LFS_PKG_DIR}/${MOD_NAME}/${module}.md5 | grep "[0-9]" 1> /dev/null 2>&1; then
+    if cat ${LFS_PKG_DIR}/${MOD_NAME}/${module}.md5 | grep -q "[0-9]"; then
         md5sum -c ${LFS_PKG_DIR}/${MOD_NAME}/${module}.md5 >> ${LFS_LOG_FILE}
         if [ $? -ne 0 ]; then
             echo "  md5sum error for ${module}"