fixed unbound variable

[build.git] / build.common

diff --git a/build.common b/build.common
index 52c1887..217fa1a 100644 (file)
--- a/build.common
+++ b/build.common
@@ -590,7 +590,7 @@ function pl_root_setup_chroot() {
     # This tells the Boot Manager that it is okay to update
     # /etc/resolv.conf and /etc/hosts whenever the network configuration
     # changes. Users are free to delete this file.
-    touch $vroot/etc/AUTO_UPDATE_NET_FILES
+    touch $root/etc/AUTO_UPDATE_NET_FILES
 }
 
 # Move specified directories out of a src tree into a dst tree, and
@@ -609,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
 }
 
@@ -636,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
 }
@@ -684,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