[spin-kickstarts] docker-base: Add some instructions for local builds
by Colin Walters
commit bf523267e266de43e47fef2350f1063bbf0861af
Author: Colin Walters <walters(a)verbum.org>
Date: Thu Mar 19 17:41:48 2015 -0400
docker-base: Add some instructions for local builds
fedora-docker-base.ks | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks
index c039c93..3b9ae6d 100644
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -2,6 +2,18 @@
#
# To keep this image minimal it only installs English language. You need to change
# yum configuration in order to enable other languages.
+#
+### Hacking on this image ###
+# This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
+# but you can run imagefactory locally too.
+#
+# To do so, testing local changes, first you'll need a TDL file. I store one here:
+# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-ra...
+#
+# Then, once you have imagefactory and imagefactory-plugins installed, run:
+#
+# imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base.ks docker
+#
cmdline
bootloader --location=none
9 years, 1 month
[spin-kickstarts] docker-base: Start shipping fstab again
by Colin Walters
commit f2ad1bb926c5ef6eaa5f60bf66c39e4a716cb953
Author: Colin Walters <walters(a)verbum.org>
Date: Thu Mar 19 17:37:37 2015 -0400
docker-base: Start shipping fstab again
Even though it's silly, the ImageFactory-in-Koji use case calls into
libguestfs to introspect the target system, and libguestfs relies on
/etc/fstab to detect installed operating systems.
fedora-docker-base.ks | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks
index 2c8127a..c039c93 100644
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -59,6 +59,5 @@ sed -i 's/OOMScoreAdjust=-900//' /etc/systemd/system/dbus.service
systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
rm -f /etc/machine-id
-rm -f /etc/fstab
%end
9 years, 1 month
[spin-kickstarts] atomic-installer: Update scripts
by Colin Walters
commit 0840fc1394830a3f970239f06cae4a2ef58ed85f
Author: Colin Walters <walters(a)verbum.org>
Date: Thu Mar 19 16:50:41 2015 -0400
atomic-installer: Update scripts
These are now based on
https://github.com/rhinstaller/lorax/pull/8
atomic-installer/lorax-configure-repo.tmpl | 8 ++++++++
atomic-installer/lorax-embed-repo.tmpl | 21 +++++++++------------
2 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/atomic-installer/lorax-configure-repo.tmpl b/atomic-installer/lorax-configure-repo.tmpl
new file mode 100644
index 0000000..7c79612
--- /dev/null
+++ b/atomic-installer/lorax-configure-repo.tmpl
@@ -0,0 +1,8 @@
+## Lorax template to configure Anaconda to use the local OSTree
+## repository on disk.
+
+<%page args="ostree_osname, ostree_ref"/>
+append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:////run/install/repo/content/repo --ref=${ostree_ref}\n"
+append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
+append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\n%end\n"
+
diff --git a/atomic-installer/lorax-embed-repo.tmpl b/atomic-installer/lorax-embed-repo.tmpl
index fe5a810..3ab0c33 100644
--- a/atomic-installer/lorax-embed-repo.tmpl
+++ b/atomic-installer/lorax-embed-repo.tmpl
@@ -1,14 +1,11 @@
## Lorax template to embed an OSTree repository into the installer.iso
## and configure an interactive installer use to look for it.
-
-<%page args='root'/>
-mkdir install/ostree
-runcmd ostree --repo=${root}/install/ostree init --mode=archive-z2
-runcmd ostree remote add ostree-mirror --repo=${root}/install/ostree/ --set=gpg-verify=false @OSTREE_URL@
-runcmd ostree --repo=${root}/install/ostree/ pull --mirror ostree-mirror @OSTREE_REF@
-
-
-append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=@OSTREE_OSNAME@ --remote=@OSTREE_OSNAME@ --url=file:///install/ostree --ref=@OSTREE_REF@\n"
-append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
-append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/@OSTREE_OSNAME@.conf\n%end\n"
-
+##
+## Note that we pull with depth=0 to only get *one* commit into the
+## ISO, because we obviously don't want the full history.
+
+<%page args="workdir, ostree_osname, ostree_repo, ostree_ref"/>
+runcmd mkdir -p ${workdir}/iso-graft/content/repo
+runcmd ostree --repo=${workdir}/iso-graft/content/repo init --mode=archive-z2
+runcmd ostree --repo=${workdir}/iso-graft/content/repo remote add ostree-mirror --set=gpg-verify=false ${ostree_repo}
+runcmd ostree --repo=${workdir}/iso-graft/content/repo pull --mirror ostree-mirror ${ostree_ref}
9 years, 1 month
[spin-kickstarts/f22] jam: change kde config location
by Brendan Jones
commit 9fa38d0117982c493f0e355817bf2843fa66e95d
Author: Brendan Jones <brendan.jones.it(a)gmail.com>
Date: Thu Mar 19 05:38:03 2015 +0100
jam: change kde config location
fedora-live-jam_kde.ks | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-live-jam_kde.ks b/fedora-live-jam_kde.ks
index 581609c..c55c0c5 100644
--- a/fedora-live-jam_kde.ks
+++ b/fedora-live-jam_kde.ks
@@ -199,7 +199,7 @@ thunderbird
%post
#setup kickoff favorites
-/bin/mkdir -p /etc/skel/.kde/share/config
+/bin/mkdir -p /etc/skel/.config
JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/pavucontrol.desktop,/usr/share/applications/kde4/kfmclient_html.desktop,/usr/share/applications/kde4/Kontact.desktop,/usr/share/applications/kde4/ktp-contactlist.desktop
JAMFAVORITESLIVE=/usr/share/applications/liveinst.desktop,$JAMFAVORITES
9 years, 1 month
[spin-kickstarts] jam: change kde config location
by Brendan Jones
commit 1546029c576cd7688509173e591c8868d78d17fd
Author: Brendan Jones <brendan.jones.it(a)gmail.com>
Date: Thu Mar 19 05:36:26 2015 +0100
jam: change kde config location
fedora-live-jam_kde.ks | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-live-jam_kde.ks b/fedora-live-jam_kde.ks
index 581609c..c55c0c5 100644
--- a/fedora-live-jam_kde.ks
+++ b/fedora-live-jam_kde.ks
@@ -199,7 +199,7 @@ thunderbird
%post
#setup kickoff favorites
-/bin/mkdir -p /etc/skel/.kde/share/config
+/bin/mkdir -p /etc/skel/.config
JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/pavucontrol.desktop,/usr/share/applications/kde4/kfmclient_html.desktop,/usr/share/applications/kde4/Kontact.desktop,/usr/share/applications/kde4/ktp-contactlist.desktop
JAMFAVORITESLIVE=/usr/share/applications/liveinst.desktop,$JAMFAVORITES
9 years, 1 month
[spin-kickstarts] add fedora-cloud-base-vagrant.ks based on fedora-cloud-atomic-vagrant
by Matthew Miller
commit d90cbcb8559cbb11f3dee66c34c581da76b42158
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Wed Mar 18 15:37:20 2015 -0400
add fedora-cloud-base-vagrant.ks based on fedora-cloud-atomic-vagrant
THIS IS JUST A STARTING POINT — untested!
fedora-cloud-base-vagrant.ks | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/fedora-cloud-base-vagrant.ks b/fedora-cloud-base-vagrant.ks
new file mode 100644
index 0000000..6cf04ca
--- /dev/null
+++ b/fedora-cloud-base-vagrant.ks
@@ -0,0 +1,28 @@
+# Like the Cloud Base image, but tuned for vagrant. Enable
+# the vagrant user, disable cloud-init.
+
+%include fedora-cloud-base.ks
+
+services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
+
+user --name=vagrant --password=vagrant
+
+%post --erroronfail
+
+# Work around cloud-init being both disabled and enabled; need
+# to refactor to a common base.
+systemctl mask cloud-init cloud-init-local cloud-config cloud-final
+
+# Vagrant setup
+sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
+echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
+sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
+mkdir -m 0700 -p ~vagrant/.ssh
+cat > ~vagrant/.ssh/authorized_keys << EOKEYS
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
+EOKEYS
+chmod 600 ~vagrant/.ssh/authorized_keys
+chown -R vagrant:vagrant ~vagrant/.ssh/
+
+%end
+
9 years, 1 month
[spin-kickstarts/f22] add fedora-cloud-base-vagrant.ks based on fedora-cloud-atomic-vagrant
by Matthew Miller
commit cf9444b68252aad29b4bd4abb40f92c2c56de830
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Wed Mar 18 15:37:20 2015 -0400
add fedora-cloud-base-vagrant.ks based on fedora-cloud-atomic-vagrant
THIS IS JUST A STARTING POINT — untested!
fedora-cloud-base-vagrant.ks | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/fedora-cloud-base-vagrant.ks b/fedora-cloud-base-vagrant.ks
new file mode 100644
index 0000000..6cf04ca
--- /dev/null
+++ b/fedora-cloud-base-vagrant.ks
@@ -0,0 +1,28 @@
+# Like the Cloud Base image, but tuned for vagrant. Enable
+# the vagrant user, disable cloud-init.
+
+%include fedora-cloud-base.ks
+
+services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
+
+user --name=vagrant --password=vagrant
+
+%post --erroronfail
+
+# Work around cloud-init being both disabled and enabled; need
+# to refactor to a common base.
+systemctl mask cloud-init cloud-init-local cloud-config cloud-final
+
+# Vagrant setup
+sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
+echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
+sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
+mkdir -m 0700 -p ~vagrant/.ssh
+cat > ~vagrant/.ssh/authorized_keys << EOKEYS
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
+EOKEYS
+chmod 600 ~vagrant/.ssh/authorized_keys
+chown -R vagrant:vagrant ~vagrant/.ssh/
+
+%end
+
9 years, 1 month
[spin-kickstarts/f22] lorax-embed-repo: Update to use HTTP-based location
by Dennis Gilmore
commit bfc2901422b029cb9f17f434a4b0920a8698dc5c
Author: Colin Walters <walters(a)verbum.org>
Date: Mon Mar 16 13:52:28 2015 -0400
lorax-embed-repo: Update to use HTTP-based location
rpm-ostree-toolbox always uses this code path now; we spawn an "ostree
trivial-httpd" even for local use. That way the same template can be
used for both remote repositories and local ones.
atomic-installer/lorax-embed-repo.tmpl | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/atomic-installer/lorax-embed-repo.tmpl b/atomic-installer/lorax-embed-repo.tmpl
index 97dd768..fe5a810 100644
--- a/atomic-installer/lorax-embed-repo.tmpl
+++ b/atomic-installer/lorax-embed-repo.tmpl
@@ -1,10 +1,14 @@
-## Lorax template to embed ostree repo into installer
-
-<%page args="root, ostree_osname, ostree_repo, ostree_ref"/>
+## Lorax template to embed an OSTree repository into the installer.iso
+## and configure an interactive installer use to look for it.
+<%page args='root'/>
mkdir install/ostree
-
runcmd ostree --repo=${root}/install/ostree init --mode=archive-z2
-runcmd ostree --repo=${root}/install/ostree pull-local --disable-fsync ${ostree_repo} ${ostree_ref}
+runcmd ostree remote add ostree-mirror --repo=${root}/install/ostree/ --set=gpg-verify=false @OSTREE_URL@
+runcmd ostree --repo=${root}/install/ostree/ pull --mirror ostree-mirror @OSTREE_REF@
+
+
+append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=@OSTREE_OSNAME@ --remote=@OSTREE_OSNAME@ --url=file:///install/ostree --ref=@OSTREE_REF@\n"
+append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
+append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/@OSTREE_OSNAME@.conf\n%end\n"
-append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:///install/ostree --ref=${ostree_ref}\n"
9 years, 1 month