[spin-kickstarts/f22] atomic-installer/: New subdirectory with Lorax template
by Dennis Gilmore
commit 47ab710fe2a9409e13aa4684c66976b38d3d5a44
Author: Colin Walters <walters(a)verbum.org>
Date: Mon Mar 16 13:40:31 2015 -0400
atomic-installer/: New subdirectory with Lorax template
This is migrated from https://github.com/projectatomic/rpm-ostree-toolbox/blob/master/src/py/lo...
It is a command template to embed content into the installer.
atomic-installer/lorax-embed-repo.tmpl | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/atomic-installer/lorax-embed-repo.tmpl b/atomic-installer/lorax-embed-repo.tmpl
new file mode 100644
index 0000000..97dd768
--- /dev/null
+++ b/atomic-installer/lorax-embed-repo.tmpl
@@ -0,0 +1,10 @@
+## Lorax template to embed ostree repo into installer
+
+<%page args="root, ostree_osname, ostree_repo, ostree_ref"/>
+
+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}
+
+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
[spin-kickstarts/f22] Remove the firewall line as it causes anaconda to add firewalld to the package set. revert back to f
by Dennis Gilmore
commit 0959478eab9dc37d83d74545dfac9e4761c9f0f1
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Mar 13 13:36:10 2015 -0500
Remove the firewall line as it causes anaconda to add firewalld to the
package set. revert back to fedora-release
fedora-docker-base.ks | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks
index d638f69..c039c93 100644
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -9,7 +9,6 @@ timezone --isUtc --nontp Etc/UTC
rootpw --plaintext qweqwe
keyboard us
-firewall --disable
zerombr
clearpart --all
part / --size 3000 --fstype ext4
@@ -18,9 +17,7 @@ reboot
%packages --excludedocs --instLangs=en --nocore
bash
-# dnf is pulling in fedora-release-server on installs. so for now pull in a product release that
-# does not pull in extra deps and makes the image smaller
-fedora-release-cloud
+fedora-release
rootfiles
vim-minimal
dnf
9 years, 1 month
[spin-kickstarts] lorax-embed-repo: Update to use HTTP-based location
by Colin Walters
commit cba7d688790426a77328965bc1eaeda3e713c700
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
[spin-kickstarts] atomic-installer/: New subdirectory with Lorax template
by Colin Walters
commit 71c243e572a95dad2f4945492054d1d962b566bf
Author: Colin Walters <walters(a)verbum.org>
Date: Mon Mar 16 13:40:31 2015 -0400
atomic-installer/: New subdirectory with Lorax template
This is migrated from https://github.com/projectatomic/rpm-ostree-toolbox/blob/master/src/py/lo...
It is a command template to embed content into the installer.
atomic-installer/lorax-embed-repo.tmpl | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/atomic-installer/lorax-embed-repo.tmpl b/atomic-installer/lorax-embed-repo.tmpl
new file mode 100644
index 0000000..97dd768
--- /dev/null
+++ b/atomic-installer/lorax-embed-repo.tmpl
@@ -0,0 +1,10 @@
+## Lorax template to embed ostree repo into installer
+
+<%page args="root, ostree_osname, ostree_repo, ostree_ref"/>
+
+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}
+
+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
[spin-kickstarts] Remove the firewall line as it causes anaconda to add firewalld to the package set. revert back to f
by Dennis Gilmore
commit 44178ef0b3b9b7bd66b175f76129850eac773b4a
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Mar 13 13:36:10 2015 -0500
Remove the firewall line as it causes anaconda to add firewalld to the
package set. revert back to fedora-release
fedora-docker-base.ks | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks
index 5589c59..2c8127a 100644
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -9,7 +9,6 @@ timezone --isUtc --nontp Etc/UTC
rootpw --plaintext qweqwe
keyboard us
-firewall --disable
zerombr
clearpart --all
part / --size 3000 --fstype ext4
@@ -18,9 +17,7 @@ reboot
%packages --excludedocs --instLangs=en --nocore
bash
-# dnf is pulling in fedora-release-server on installs. so for now pull in a product release that
-# does not pull in extra deps and makes the image smaller
-fedora-release-cloud
+fedora-release
rootfiles
vim-minimal
dnf
9 years, 1 month
[spin-kickstarts/f22] pull in fedora-release-cloud to make the docker base image smaller
by Dennis Gilmore
commit 427657159d7cf3f7edea652f297bd73c1690e91c
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Mar 11 10:38:08 2015 -0500
pull in fedora-release-cloud to make the docker base image smaller
during install dnf was pulling in fedora-release-server which added a lot of bloat
fedora-docker-base.ks | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks
index 378bff2..d638f69 100644
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -18,7 +18,9 @@ reboot
%packages --excludedocs --instLangs=en --nocore
bash
-fedora-release
+# dnf is pulling in fedora-release-server on installs. so for now pull in a product release that
+# does not pull in extra deps and makes the image smaller
+fedora-release-cloud
rootfiles
vim-minimal
dnf
9 years, 1 month
[spin-kickstarts] kde: nuke nepomuk references
by Rex Dieter
commit 6eee3644ad952bc0f2aea88b9f26af759467428e
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Wed Mar 11 12:56:39 2015 -0500
kde: nuke nepomuk references
fedora-live-kde-base.ks | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index b30246f..32ec69b 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -107,15 +107,6 @@ cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
Enabled=false
KRES_EOF
-# Disable nepomuk
-cat > /home/liveuser/.kde/share/config/nepomukserverrc << NEPOMUK_EOF
-[Basic Settings]
-Start Nepomuk=false
-
-[Service-nepomukfileindexer]
-autostart=false
-NEPOMUK_EOF
-
# make sure to set the right permissions and selinux contexts
chown -R liveuser:liveuser /home/liveuser/
restorecon -R /home/liveuser/
9 years, 1 month
[spin-kickstarts/f22] kde: nuke nepomuk references
by Rex Dieter
commit dbe507bd9109c61670f0d189712712a839e3a77e
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Wed Mar 11 12:56:39 2015 -0500
kde: nuke nepomuk references
fedora-live-kde-base.ks | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index b30246f..32ec69b 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -107,15 +107,6 @@ cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
Enabled=false
KRES_EOF
-# Disable nepomuk
-cat > /home/liveuser/.kde/share/config/nepomukserverrc << NEPOMUK_EOF
-[Basic Settings]
-Start Nepomuk=false
-
-[Service-nepomukfileindexer]
-autostart=false
-NEPOMUK_EOF
-
# make sure to set the right permissions and selinux contexts
chown -R liveuser:liveuser /home/liveuser/
restorecon -R /home/liveuser/
9 years, 1 month
[spin-kickstarts/f22] kde: s/oxygen-gtk/Adwaita/
by Rex Dieter
commit 0b6884a62e46c3b851e978db1570d6a3b8cfb482
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Wed Mar 11 12:54:43 2015 -0500
kde: s/oxygen-gtk/Adwaita/
fedora-live-kde-base.ks | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index 7da46a3..b30246f 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -13,16 +13,16 @@ DESKTOP="KDE"
DISPLAYMANAGER="KDE"
EOF
-# make oxygen-gtk the default GTK+ theme for root (see #683855, #689070, #808062)
+# set default GTK+ theme for root (see #683855, #689070, #808062)
cat > /root/.gtkrc-2.0 << EOF
-include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
+include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
include "/etc/gtk-2.0/gtkrc"
-gtk-theme-name="oxygen-gtk"
+gtk-theme-name="Adwaita"
EOF
mkdir -p /root/.config/gtk-3.0
cat > /root/.config/gtk-3.0/settings.ini << EOF
[Settings]
-gtk-theme-name = oxygen-gtk
+gtk-theme-name = Adwaita
EOF
# add initscript
9 years, 1 month
[spin-kickstarts] kde: s/oxygen-gtk/Adwaita/
by Rex Dieter
commit a9a49fa3d612ee5ce9f6e3d95a52c6c2fcdfcab0
Author: Rex Dieter <rdieter(a)math.unl.edu>
Date: Wed Mar 11 12:54:43 2015 -0500
kde: s/oxygen-gtk/Adwaita/
fedora-live-kde-base.ks | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index 7da46a3..b30246f 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -13,16 +13,16 @@ DESKTOP="KDE"
DISPLAYMANAGER="KDE"
EOF
-# make oxygen-gtk the default GTK+ theme for root (see #683855, #689070, #808062)
+# set default GTK+ theme for root (see #683855, #689070, #808062)
cat > /root/.gtkrc-2.0 << EOF
-include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
+include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
include "/etc/gtk-2.0/gtkrc"
-gtk-theme-name="oxygen-gtk"
+gtk-theme-name="Adwaita"
EOF
mkdir -p /root/.config/gtk-3.0
cat > /root/.config/gtk-3.0/settings.ini << EOF
[Settings]
-gtk-theme-name = oxygen-gtk
+gtk-theme-name = Adwaita
EOF
# add initscript
9 years, 1 month