git://git.onelab.eu
/
sliceimage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
43a60b4
)
workaround for 32bits slice images when running under libvirt where the personality...
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Tue, 1 Jul 2014 21:39:59 +0000
(23:39 +0200)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Tue, 1 Jul 2014 21:39:59 +0000
(23:39 +0200)
build.sh
patch
|
blob
|
history
diff --git
a/build.sh
b/build.sh
index
53df754
..
60a7904
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-169,6
+169,14
@@
postfile=$(pl_locateDistroFile ../build/ ${pldistro} sliceimage.post)
# fix sudoers config
[ -f ${vref}/etc/sudoers ] && echo -e "\nDefaults\tlogfile=/var/log/sudo\n" >> ${vref}/etc/sudoers
# fix sudoers config
[ -f ${vref}/etc/sudoers ] && echo -e "\nDefaults\tlogfile=/var/log/sudo\n" >> ${vref}/etc/sudoers
+# make sure 32bit slice images have the right yum config in /etc/yum/vars
+# this issue showed on a f18 64bits node hosting a f14 32bits sliver
+# this workaround probably means the 32bits sliver does not properly run as a 32bits VM
+grep -q i386 ${vref}/etc/slicefamily && {
+ echo i686 > ${vref}/etc/yum/vars/arch
+ echo i386 > /etc/yum/vars/basearch
+}
+
# cleanup yum remainings
rm -rf ${vref}/build ${vref}/longbuildroot
# cleanup yum remainings
rm -rf ${vref}/build ${vref}/longbuildroot