git://git.onelab.eu
/
nodeimage.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
for onelab
[nodeimage.git]
/
build.sh
diff --git
a/build.sh
b/build.sh
index
75292e6
..
7ecf15a
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-62,6
+62,8
@@
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}
+# for distros that do not define bootstrapfs variants
+shopt -s nullglob
for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,)
for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,)
@@
-96,10
+98,11
@@
for pkgs in ../build/config.${pldistro}/bootstrapfs-*.pkgs ; do
done
# Disable splaying of cron.
done
# Disable splaying of cron.
- echo > ${vref}/etc/sysconfig/crontab
+ # At this step, vdir is base, and vref is the set of changes that end up in the nodegroup
+ echo > ${vdir}/etc/sysconfig/crontab
# Add site_admin account
# Add site_admin account
- chroot ${v
ref
} /usr/sbin/useradd -p "" -u 502 -m site_admin
+ chroot ${v
dir
} /usr/sbin/useradd -p "" -u 502 -m site_admin
# Create a copy of the ${NAME} bootstrap filesystem w/o the base
# bootstrap filesystem and make it smaller. This is a three step
# Create a copy of the ${NAME} bootstrap filesystem w/o the base
# bootstrap filesystem and make it smaller. This is a three step