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 (parent:
0ac9b7b
)
Improved mirror configuration in lbuild-initvm.sh: Now, the mirror can just be specif...
author
Thomas Dreibholz
<dreibh@simula.no>
Tue, 8 Apr 2014 11:24:10 +0000
(13:24 +0200)
committer
Thomas Dreibholz
<dreibh@simula.no>
Tue, 8 Apr 2014 11:24:10 +0000
(13:24 +0200)
lbuild-initvm.sh
patch
|
blob
|
history
diff --git
a/lbuild-initvm.sh
b/lbuild-initvm.sh
index
f224e9f
..
39d6518
100755
(executable)
--- a/
lbuild-initvm.sh
+++ b/
lbuild-initvm.sh
@@
-32,6
+32,7
@@
PUBLIC_BRIDGE=br0
VIF_GUEST=eth0
##########
VIF_GUEST=eth0
##########
+FEDORA_MIRROR_BASE="http://mirror.onelab.eu/fedora/"
FEDORA_PREINSTALLED="yum initscripts passwd rsyslog vim-minimal dhclient chkconfig rootfiles policycoreutils openssh-server openssh-clients"
DEBIAN_PREINSTALLED="openssh-server openssh-client"
FEDORA_PREINSTALLED="yum initscripts passwd rsyslog vim-minimal dhclient chkconfig rootfiles policycoreutils openssh-server openssh-clients"
DEBIAN_PREINSTALLED="openssh-server openssh-client"
@@
-158,7
+159,7
@@
function fedora_download() {
sed -i "s/\$basearch/$arch/g; s/\$releasever/$release/g;" $f
done
sed -i "s/\$basearch/$arch/g; s/\$releasever/$release/g;" $f
done
- MIRROR_URL=
http://mirror.onelab.eu/fedora
/releases/$release/Everything/$arch/os
+ MIRROR_URL=
$FEDORA_MIRROR_BASE
/releases/$release/Everything/$arch/os
RELEASE_URL1="$MIRROR_URL/Packages/fedora-release-$release-1.noarch.rpm"
# with fedora18 the rpms are scattered by first name
RELEASE_URL2="$MIRROR_URL/Packages/f/fedora-release-$release-1.noarch.rpm"
RELEASE_URL1="$MIRROR_URL/Packages/fedora-release-$release-1.noarch.rpm"
# with fedora18 the rpms are scattered by first name
RELEASE_URL2="$MIRROR_URL/Packages/f/fedora-release-$release-1.noarch.rpm"
@@
-315,22
+316,22
@@
function fedora_configure_yum () {
cat > $lxc_root/etc/yum.repos.d/building.repo <<EOF
[fedora]
cat > $lxc_root/etc/yum.repos.d/building.repo <<EOF
[fedora]
-name=Fedora
$release - $
arch
-baseurl=
http://mirror.onelab.eu/fedora/releases/$release/Everything/$
arch/os/
+name=Fedora
\$releasever - \$base
arch
+baseurl=
$FEDORA_MIRROR_BASE/releases/\$releasever/Everything/\$base
arch/os/
enabled=1
metadata_expire=7d
gpgcheck=1
enabled=1
metadata_expire=7d
gpgcheck=1
-gpgkey=
http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-$release-primary
+gpgkey=
file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-\$releasever-\$basearch
[updates]
[updates]
-name=Fedora
$release - $
arch - Updates
-baseurl=
http://mirror.onelab.eu/fedora/updates/$release/$
arch/
+name=Fedora
\$releasever - \$base
arch - Updates
+baseurl=
$FEDORA_MIRROR_BASE/updates/\$releasever/\$base
arch/
enabled=1
metadata_expire=7d
gpgcheck=1
enabled=1
metadata_expire=7d
gpgcheck=1
-gpgkey=
http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-$release-primary
+gpgkey=
file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-\$releasever-\$basearch
EOF
EOF
-
+
# for using vtest-init-lxc.sh as a general-purpose lxc creation wrapper
# just mention 'none' as the repo url
if [ -n "$REPO_URL" ] ; then
# for using vtest-init-lxc.sh as a general-purpose lxc creation wrapper
# just mention 'none' as the repo url
if [ -n "$REPO_URL" ] ; then