git://git.onelab.eu
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
9ff4161
)
Fix the test to determine whether the distro is SysVinit or systemd based
author
Mohamed Larabi
<mohamed.larabi@inria.fr>
Fri, 26 Apr 2013 17:30:40 +0000
(19:30 +0200)
committer
Mohamed Larabi
<mohamed.larabi@inria.fr>
Fri, 26 Apr 2013 17:30:40 +0000
(19:30 +0200)
vbuild-init-lxc.sh
patch
|
blob
|
history
diff --git
a/vbuild-init-lxc.sh
b/vbuild-init-lxc.sh
index
22f6822
..
329bae5
100755
(executable)
--- a/
vbuild-init-lxc.sh
+++ b/
vbuild-init-lxc.sh
@@
-563,8
+563,7
@@
function setup_lxc() {
exit 1
fi
- type /bin/systemd >/dev/null 2>&1
- if [ $? -ne 0 ]; then
+ if [ ! -d ${rootfs_path}/etc/systemd ]; then
configure_fedora_init
else
configure_fedora_systemd
@@
-590,7
+589,7
@@
function setup_lxc() {
<name>$lxc</name>
<memory>524288</memory>
<os>
- <type>exe</type>
+ <type
arch='$arch2'
>exe</type>
<init>/sbin/init</init>
</os>
<features>
@@
-917,7
+916,7
@@
function main () {
if [ "$personality" == "linux32" ]; then
arch=i386
- arch2=
x
86
+ arch2=
i6
86
elif [ "$personality" == "linux64" ]; then
arch=x86_64
arch2=x86_64