Added pf2slice to module list. This goes into the pl_netflow slice.

[build.git] / build.common

diff --git a/build.common b/build.common
index 9d5afa0..983ed75 100644 (file)
--- a/build.common
+++ b/build.common
@@ -128,7 +128,7 @@ function pl_process_fedora_options () {
 function pl_root_rpm_macros () {
     cat <<EOF
 %_install_langs C:en_US:en
-%_netsharedpath /proc:/dev/pts
+%_netsharedpath /proc:/dev/pts:/usr/share/info
 %_excludedocs 1
 %__file_context_path /dev/null
 EOF
@@ -333,6 +333,8 @@ linux/core/$releasever/$basearch/os
        done
        echo
        mkfedora_usage
+    else
+       echo "* selecting mirror with baseurl=$baseurl"
     fi
 
     # Do not tolerate errors
@@ -607,7 +609,7 @@ function pl_move_dirs() {
        fi
        rm -rf ${root}/${datadir}
        mkdir -p $(dirname ${root}/${datadir})
-       ln -nsf /${store}/${datadir} ${root}/${datadir}
+       ln -nsf ${store}/${datadir} ${root}/${datadir}
     done
 }
 
@@ -634,7 +636,7 @@ function pl_make_image() {
     (cd $root && tar cpf - .) | (cd $tmp && tar xpf -)
 
     # Unmount it
-    umount -l $tmp
+    umount $tmp
     rmdir $tmp
     trap - ERR INT
 }
@@ -682,9 +684,9 @@ function pl_parsePkgs () {
     # grab regular descriptions
     all=$(grep -v '^#' "$@" | grep --regexp="^${keyword}:" | sed -e "s,${keyword}:,,")
     # grab additions
-    add=$(grep -v '^#' "$@" | grep --regexp="^${keyword}+${fcdistro}:" | sed -e "s,${keyword}\+${fcdistro}:,,")
+    add=$(grep -v '^#' "$@" | grep --regexp="^${keyword}+${fcdistro}:" | sed -e "s,${keyword}+${fcdistro}:,,")
     # grab exclusions
-    sub=$(grep -v '^#' "$@" | grep --regexp="^${keyword}\-${fcdistro}:" | sed -e "s,${keyword}\-${fcdistro}:,,")
+    sub=$(grep -v '^#' "$@" | grep --regexp="^${keyword}-${fcdistro}:" | sed -e "s,${keyword}-${fcdistro}:,,")
 
     for i in $all $add; do
        for exclude in $sub; do