[spin-kickstarts] cloud-atomic: Bring sanity to the remote setup
by Colin Walters
commit 90e71f7a4bfbdd5001a9cb92cbdb1d4ec08bdc7a
Author: Colin Walters <walters(a)verbum.org>
Date: Mon Nov 17 15:55:35 2014 -0500
cloud-atomic: Bring sanity to the remote setup
We were doing gyrations here between the "installmedia" remote and the
intended "fedora-atomic" remote. Thinking about this, it's *far*
simpler if we pretend installmedia is the target remote.
We still need to delete the remote configuration Anaconda added and
re-add it with the real target URL.
Conflicts:
fedora-cloud-atomic.ks
fedora-cloud-atomic.ks | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 77162f6..335cdd8 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -30,11 +30,14 @@ volgroup atomicos pv.01
logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
# Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic-host --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
reboot
%post --erroronfail
+# See https://github.com/projectatomic/rpm-ostree/issues/42
+ostree remote delete fedora-atomic
+ostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/rawhide/'
# older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
9 years, 4 months
[spin-kickstarts/f21] cloud-atomic: Change osname to 'fedora-atomic'
by Colin Walters
commit 31cfa9a3b220c6a672d6f90c2c4f1cf948948c12
Author: Colin Walters <walters(a)verbum.org>
Date: Mon Nov 17 15:59:07 2014 -0500
cloud-atomic: Change osname to 'fedora-atomic'
No reason to have it differ, really.
fedora-cloud-atomic.ks | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 30a4866..2acfa2f 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -29,7 +29,7 @@ part pv.01 --grow
volgroup atomicos pv.01
logvol / --size=2000 --fstype="xfs" --name=root --vgname=atomicos
-ostreesetup --nogpg --osname=fedora-atomic-host --remote=fedora-atomic --url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/ --ref=fedora-atomic/f21/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/ --ref=fedora-atomic/f21/x86_64/docker-host
reboot
9 years, 4 months
[spin-kickstarts/f21] cloud-atomic: Bring sanity to the remote setup
by Colin Walters
commit f9306a033450b1b6638096a8956889178ab7ad8d
Author: Colin Walters <walters(a)verbum.org>
Date: Mon Nov 17 15:55:35 2014 -0500
cloud-atomic: Bring sanity to the remote setup
We were doing gyrations here between the "installmedia" remote and the
intended "fedora-atomic" remote. Thinking about this, it's *far*
simpler if we pretend installmedia is the target remote.
We still need to delete the remote configuration Anaconda added and
re-add it with the real target URL.
fedora-cloud-atomic.ks | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 1d1294c..30a4866 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -29,7 +29,7 @@ part pv.01 --grow
volgroup atomicos pv.01
logvol / --size=2000 --fstype="xfs" --name=root --vgname=atomicos
-ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/ --ref=fedora-atomic/f21/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic-host --remote=fedora-atomic --url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/ --ref=fedora-atomic/f21/x86_64/docker-host
reboot
@@ -37,9 +37,8 @@ reboot
%post --erroronfail
# See https://github.com/projectatomic/rpm-ostree/issues/42
+ostree remote delete fedora-atomic
ostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/21/'
-(origin_file=$(echo -n /ostree/deploy/fedora-atomic-host/deploy/*.origin); sed -e 's,installmedia:,fedora-atomic:,' < ${origin_file} > ${origin_file}.new && mv ${origin_file}{.new,})
-rm /ostree/repo/refs/remotes/installmedia -rf
# older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
9 years, 4 months
Any chance at all of getting the Jam spin included for f21?
by Brendan Jones
The subject says it all I guess. We have missed testing at alpha... the
spin is building OK - there is a real community interest, I have just
been too busy of late in following up.
Is there anything I can do?
cheers
Brendan
9 years, 4 months
[spin-kickstarts/f21] scientific: add python3-sympy
by Amit Saha
commit 7a7d16bc5cdc954f980a0198cd9e8292f923d476
Author: Amit Saha <amitksaha(a)fedoraproject.org>
Date: Sun Nov 16 09:05:18 2014 +1000
scientific: add python3-sympy
fedora-livedvd-scientific_kde.ks | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/fedora-livedvd-scientific_kde.ks b/fedora-livedvd-scientific_kde.ks
index d76cbf0..84f24c7 100644
--- a/fedora-livedvd-scientific_kde.ks
+++ b/fedora-livedvd-scientific_kde.ks
@@ -65,6 +65,7 @@ python3-numpy
python3-ipython
python3-ipython-console
python3-ipython-notebook
+python3-sympy
python3-networkx
python3-pandas
9 years, 4 months
[spin-kickstarts/f21] Scientific: Add couple of new tools
by Amit Saha
commit f56faabf5ae22b06db8860a5f4ae0fc5767aad5e
Author: Amit Saha <amitksaha(a)fedoraproject.org>
Date: Sun Nov 16 08:32:58 2014 +1000
Scientific: Add couple of new tools
Adds IDLE and pandas for both Python 2 and 3.
fedora-livedvd-scientific_kde.ks | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/fedora-livedvd-scientific_kde.ks b/fedora-livedvd-scientific_kde.ks
index 52d15c5..d76cbf0 100644
--- a/fedora-livedvd-scientific_kde.ks
+++ b/fedora-livedvd-scientific_kde.ks
@@ -48,14 +48,17 @@ ddd
valgrind
#python 2 tools/libraries not included from the groups
+python-tools
python-ipython
python-ipython-console
python-ipython-notebook
sympy
python-networkx
+python-pandas
#python 3 and tools/libraries not included from the groups
python3
+python3-tools
python3-matplotlib
python3-scipy
python3-numpy
@@ -63,6 +66,7 @@ python3-ipython
python3-ipython-console
python3-ipython-notebook
python3-networkx
+python3-pandas
# matplotlib backends
python-matplotlib-qt4
9 years, 4 months
[spin-kickstarts] make the cloud base lang hacks line up with the same filenames as in the docker image
by Matthew Miller
commit 5710f9ff65cd675de69ba505e39dee6daaa3529c
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Fri Nov 14 10:19:21 2014 -0500
make the cloud base lang hacks line up with the same filenames as in the docker image
fedora-cloud-base.ks | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 5a539a7..d2595c8 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -127,7 +127,10 @@ localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archiv
# this will kill a live system (since it's memory mapped) but should be safe offline
mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
build-locale-archive
-echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.install_langs
+echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
+awk '(NF==0&&!done){print "override_install_langs='$LANG'";done=1}{print}' \
+ < /etc/yum.conf > /etc/yum.conf.new
+mv /etc/yum.conf.new /etc/yum.conf
echo -n "Getty fixes"
9 years, 4 months
[spin-kickstarts/f21] make the cloud base lang hacks line up with the same filenames as in the docker image
by Matthew Miller
commit ddb2862b527e0dbf7b1d199c270d203af781aced
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Fri Nov 14 10:19:21 2014 -0500
make the cloud base lang hacks line up with the same filenames as in the docker image
fedora-cloud-base.ks | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 9159b5d..e1a978e 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -122,7 +122,10 @@ localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archiv
# this will kill a live system (since it's memory mapped) but should be safe offline
mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
build-locale-archive
-echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.install_langs
+echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
+awk '(NF==0&&!done){print "override_install_langs='$LANG'";done=1}{print}' \
+ < /etc/yum.conf > /etc/yum.conf.new
+mv /etc/yum.conf.new /etc/yum.conf
echo -n "Getty fixes"
9 years, 4 months
[spin-kickstarts] more hacks for en_US in cloud base image
by Matthew Miller
commit 39c412833ede9f9654183724547488ece7dbd7db
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Thu Nov 13 14:10:18 2014 -0500
more hacks for en_US in cloud base image
fedora-cloud-base.ks | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 195b723..5a539a7 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -127,6 +127,8 @@ localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archiv
# this will kill a live system (since it's memory mapped) but should be safe offline
mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
build-locale-archive
+echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.install_langs
+
echo -n "Getty fixes"
# although we want console output going to the serial console, we don't
9 years, 4 months