git://git.onelab.eu
/
bootstrapfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5f64941
)
minor clean up of code that invokes an optional .post processing script after package...
author
Marc Fiuczynski
<mef@cs.princeton.edu>
Fri, 22 Feb 2008 20:49:53 +0000
(20:49 +0000)
committer
Marc Fiuczynski
<mef@cs.princeton.edu>
Fri, 22 Feb 2008 20:49:53 +0000
(20:49 +0000)
build.sh
patch
|
blob
|
history
diff --git
a/build.sh
b/build.sh
index
70cb134
..
dc0d7a1
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-62,8
+62,12
@@
pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.pkgs)
# -k = exclude kernel* packages
pl_root_mkfedora -k -f $pkgsfile ${vref}
# -k = exclude kernel* packages
pl_root_mkfedora -k -f $pkgsfile ${vref}
-postfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.post)
-[ "$postfile" != "not-found-by-pl_locateDistroFile" ] && /bin/bash $postfile ${vref} || :
+# optionally invoke a post processing script after packages from
+# $pkgsfile have been installed
+pkgsdir=$(dirname $pkgsfile)
+pkgsname=$(basename $pkgsfile .pkgs)
+postfile="${pkgsdir}/${pkgsname}.post"
+[ -f $postfile ] && /bin/bash $postfile ${vref} || :
# for distros that do not define bootstrapfs variants
pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc -l)
# for distros that do not define bootstrapfs variants
pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc -l)
@@
-95,8
+99,12
@@
pkgs_count=$(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs 2> /dev/null | wc
umount ${vdir}/proc
fi
umount ${vdir}/proc
fi
- postfile=$(echo $pkgs | sed -e s,pkgs,post, )
- [ "$postfile" != "not-found-by-pl_locateDistroFile" ] && /bin/bash $postfile ${vdir} || :
+ # optionally invoke a post processing script after packages from
+ # $pkgs have been installed
+ pkgsdir=$(dirname $pkgs)
+ pkgsname=$(basename $pkgs .pkgs)
+ postfile="${pkgsdir}/${pkgsname}.post"
+ [ -f $postfile ] && /bin/bash $postfile ${vdir} || :
# Create a copy of the ${NAME} bootstrap filesystem w/o the base
# Create a copy of the ${NAME} bootstrap filesystem w/o the base