summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2013-06-02 17:18:49 -0400
committerColin Walters <walters@verbum.org>2013-06-02 17:18:49 -0400
commit8e6fe23c1e26bcc1e3d8cb15b9d57c73018b1a4d (patch)
tree0386935019a2bab26fce0a1fae1709197feb56b2
parent2fa025a489d5ea69d11c88bed74caca611b18c12 (diff)
downloadfedora-ostree-8e6fe23c1e26bcc1e3d8cb15b9d57c73018b1a4d.tar.gz
fedora-ostree-8e6fe23c1e26bcc1e3d8cb15b9d57c73018b1a4d.tar.xz
fedora-ostree-8e6fe23c1e26bcc1e3d8cb15b9d57c73018b1a4d.zip
Rename, lots of fixes
-rw-r--r--fedora-ostree.repo5
-rwxr-xr-xmake-fedora-ostree-tarball37
-rwxr-xr-xmkcontainer-f198
3 files changed, 42 insertions, 8 deletions
diff --git a/fedora-ostree.repo b/fedora-ostree.repo
new file mode 100644
index 0000000..896c874
--- /dev/null
+++ b/fedora-ostree.repo
@@ -0,0 +1,5 @@
+[fedora-ostree]
+name=OSTree for Fedora $releasever - $basearch
+baseurl=http://fedorapeople.org/~walters/fedora-ostree-f19-$basearch/
+gpgcheck=0
+enabled=1
diff --git a/make-fedora-ostree-tarball b/make-fedora-ostree-tarball
new file mode 100755
index 0000000..c41b810
--- /dev/null
+++ b/make-fedora-ostree-tarball
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+srcdir=$(dirname $0)
+releasever=19
+name=fedora-ostree-${releasever}
+prefix=$(pwd)/${name}
+root=${prefix}.tmp
+output=${name}.tar.gz
+yumcachedir=${root}/var/cache/yum
+yumcache_lookaside=${prefix}-yum-cache
+
+set -x
+set -e
+
+if test -d ${yumcachedir}; then
+ mv ${yumcachedir} ${yumcache_lookaside}
+fi
+rm ${root} -rf
+if test -d ${yumcache_lookaside}; then
+ mkdir -p ${root}/var/cache/
+ mv ${yumcache_lookaside} ${yumcachedir}
+fi
+yum -c ${srcdir}/fedora-ostree.repo -y --releasever=${releasever} --nogpg --installroot=${root} --disablerepo='*' --enablerepo=fedora --enablerepo=fedora-ostree install systemd passwd yum ostree fedora-release vim-minimal kernel dracut
+if test "${mfotbreak}" = "post-yum"; then
+ bash
+fi
+# To have OSTree work, directories need to be writable by the user.
+# Also, there's no point in shipping private files; there's no
+# security on OSTree repositories, so make everything at least
+# readable.
+chmod -R u+rw,go+r ${root}
+rm ${root}/var/lib/yum/* -rf
+rm ${root}/var/cache/yum/* -rf
+rm ${root}/var/log/* -rf
+tar -c -z -C ${root} -f ${output} .
+echo "Generated ${output}"
+rm ${root} -rf
diff --git a/mkcontainer-f19 b/mkcontainer-f19
deleted file mode 100755
index d7c3c4a..0000000
--- a/mkcontainer-f19
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-root=$1
-test -n "$root" || (echo "Usage: $0 PATH"; exit 1)
-yum -y --releasever=19 --nogpg --installroot=$root --disablerepo='*' --enablerepo=fedora install systemd passwd yum fedora-release vim-minimal kernel
-chmod -R u+w $1
-rm $root/var/cache/yum -rf