packagekit-cached-metadata.ks: Set up resolv.conf and hosts files

Copy over host system's /etc/resolv.conf and /etc/hosts to make it possible to resolve kojipkgs.fedoraproject.org inside the chroot.
packagekit-cached-metadata.ks: Use http for kojipkgs.fedoraproject.org
2025-12-09 16:40:30 +08:00 · 2015-10-20 21:29:24 +02:00 · 2015-10-20 21:29:23 +02:00 · 2015-10-20 21:29:22 +02:00 · 2015-10-20 11:12:14 -05:00 · 2015-10-20 08:41:12 -05:00
12 changed files with 50 additions and 31 deletions
--- a/atomic-installer/lorax-configure-repo.tmpl
+++ b/atomic-installer/lorax-configure-repo.tmpl
@@ -4,5 +4,5 @@
 <%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\nostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/23/'\n%end\n"
+append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\n"

--- a/fedora-cloud-atomic-pxetolive.ks
+++ b/fedora-cloud-atomic-pxetolive.ks
@@ -17,7 +17,7 @@ shutdown
 services --disabled=docker-storage-setup,network
 services --enabled=NetworkManager,sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/23/ --ref=fedora-atomic/f23/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host
 
 %post

--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -33,14 +33,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 --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/23/ --ref=fedora-atomic/f23/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --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 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/23/'
+ostree remote add --set=gpg-verify=false fedora-atomic 'https://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
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -36,7 +36,7 @@ user --name=none

 firewall --disabled

-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux

 network --bootproto=dhcp --device=link --activate --onboot=on
 services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -77,6 +77,7 @@ kernel-core
 #-kbd
 -uboot-tools
 -kernel
+-grub2

 %end

@@ -113,6 +114,9 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none

+# Kickstart specifies timeout in seconds; syslinux uses 10ths.
+# 0 means wait forever, so instead we'll go with 1.
+sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf

 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
@@ -231,12 +235,21 @@ echo "-----------------------------------------------------------------------"
 rm -f /var/lib/rpm/__db*


+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+

 # FIXME: is this still needed?
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
+chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
+chattr +i /boot/extlinux/ldlinux.sys

 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -51,10 +51,17 @@ userdel -r none
 LANG="en_US"
 echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf

+# Carry these configs for both dnf and yum for users who are calling
+# yum-deprecated directly. This will keep the experience between both
+# consistent
 awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
    < /etc/yum.conf > /etc/yum.conf.new
 mv /etc/yum.conf.new /etc/yum.conf

+awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
+    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
+mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
+
 echo "Import RPM GPG key"
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=$(uname -i)
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks

 # In the master branch the rawhide repo commands should be uncommented.
-#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
-#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server

 # In non-master branches the fedora repo commands should be uncommented
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
-repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server

 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
--- a/fedora-install-server.ks
+++ b/fedora-install-server.ks
@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks

 # In the master branch the rawhide repo commands should be uncommented.
-#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
-#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation

 # In non-master branches the fedora repo commands should be uncommented
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
-repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+#repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation

 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
@@ -92,6 +92,7 @@ dracut-*
 # Web Server environment
@haproxy
@mongodb
+@perl-web
@python-web
@php
@rubyonrails
--- a/fedora-install-workstation.ks
+++ b/fedora-install-workstation.ks
@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks

 # In the master branch the rawhide repo commands should be uncommented.
-#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
-#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server

 # In non-master branches the fedora repo commands should be uncommented
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
-repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server

 %include fedora-workstation-packages.ks

--- a/fedora-live-jam_kde.ks
+++ b/fedora-live-jam_kde.ks
@@ -11,7 +11,7 @@
 #             https://fedoraproject.org/wiki/User:jvlomax
 #             Brendan Jones <brendan.jones.it@gmail.com>

-%include fedora-livecd-kde.ks
+%include fedora-live-kde.ks

 # DVD size partition
 part / --size 10240 --fstype ext4
@@ -77,7 +77,7 @@ sooperlooper

 #recodring and DAW
 audacity
-ardour3
+ardour4
 rosegarden4
 seq24
 muse
--- a/fedora-live-scientific_kde.ks
+++ b/fedora-live-scientific_kde.ks
@@ -21,9 +21,9 @@ part / --size 12288
@engineering-and-scientific

 # scilab
-#scilab
-#scilab-devel
-#scilab-doc
+scilab
+scilab-devel
+scilab-doc

 # sagemath
 # BZ #1006230 should fix this
--- a/fedora-mate-packages.ks
+++ b/fedora-mate-packages.ks
@@ -1,4 +1,5 @@
 %packages
+-PackageKit*                # we switched to yumex, so we don't need this
 firefox
@mate
 compiz
@@ -19,7 +20,7 @@ fusion-icon-gtk
 blueman

 # some apps from mate-applications
-# caja-actions
+caja-actions
 mate-disk-usage-analyzer
 mate-netspeed

@@ -38,18 +39,15 @@ parole
 exaile
 PackageKit-gstreamer-plugin

+# blacklist applications which breaks mate-desktop
+-audacious
+
 # office
@libreoffice

 # dsl tools
 rp-pppoe

-# drop packages
-PackageKit*                # we switched to yumex, so we don't need this
-
-# blacklist applications which breaks mate-desktop
-audacious
-
 # FIXME; apparently the glibc maintainers dislike this, but it got put into the
 # desktop image at some point.  We won't touch this one for now.
 nss-mdns
--- a/fedora-repo.ks
+++ b/fedora-repo.ks
@@ -3,7 +3,7 @@
 # Exactly one of the following should be uncommented

 # For the master branch the following should be uncommented
-# %include fedora-repo-rawhide.ks
+%include fedora-repo-rawhide.ks

 # For non-master branches the following should be uncommented
-%include fedora-repo-not-rawhide.ks
+# %include fedora-repo-not-rawhide.ks
Author	SHA1	Message	Date
Kalev Lember	a6d3b1c456	packagekit-cached-metadata.ks: Set up resolv.conf and hosts files Copy over host system's /etc/resolv.conf and /etc/hosts to make it possible to resolve kojipkgs.fedoraproject.org inside the chroot.	2015-10-20 21:29:24 +02:00
Kalev Lember	d293e561f4	packagekit-cached-metadata.ks: Use http for kojipkgs.fedoraproject.org It turns out that koji builders can't access kojipkgs.fedoraproject.org over https, but plain http works just fine.	2015-10-20 21:29:23 +02:00
Kalev Lember	2459d8254b	Move packagekit-cached-metadata.ks to snippets/ ... and make it a top-level script wrapped in %post ... %end.	2015-10-20 21:29:22 +02:00
Rex Dieter	6817b9661f	split pk cached metadata hack into include'able snippet and add to -kde-base	2015-10-20 11:12:14 -05:00
Rex Dieter	9fe671fe49	kde: Plasma session notifies for available updates See also http://bugzilla.redhat.com/1262600	2015-10-20 08:41:12 -05:00
Kalev Lember	a355ff602c	workstation: Include cached metadata for PackageKit Instead of taking the metadata from PackageKit-cached-metadata package as we were doing previously, copy it over directly during the compose from https://kojipkgs.fedoraproject.org/mash/ This makes it much less error prone as we always get the very latest metadata, and makes maintenance much simpler as we don't need to roll PackageKit-cached-metadata by hand. Users are also going to appreciate this because it makes post-GA updates smaller as they won't have to download updates for the PackageKit-cached-metadata subpackage each time PackageKit gets updated.	2015-10-19 20:46:36 +02:00
Luya Tshimbalanga	16d3e54ff7	design-suite: fix typo on f23-backgrounds-extras-base	2015-10-18 09:31:17 -07:00
Matthew Miller	9d0ef8b63c	adds kbd,plymouth rpms back. We have had -kbd in the kickstart for a long time, but because of BZ#1199868 it wasn't actually getting excluded. Not having it causes systemd-vconsole-setup.service to fail so we are adding it back for now. Additionally we need to add back plymouth to cover up the subsequent failure of systemd-vconsole-setup.service. See BZ#1272684.	2015-10-17 13:01:18 -04:00
Kushal Das	c5098636e8	Fixes trac #128 Removes extra ifcfg file.	2015-10-15 13:46:12 +05:30
Luya Tshimbalanga	ba2ab327a1	design-suite: restore luxrender and add extra wallpapers	2015-10-13 10:37:40 -07:00
Bruno Wolff III	d62f2f1688	Games spin: xscreensaver-extras was supposed to get removed	2015-10-13 09:50:31 -05:00
Bruno Wolff III	524149a63e	Games spin - cut to get back under 4 GiB	2015-10-12 19:30:16 -05:00
raveit65	077aacb29d	Mate add f23-backgrounds-extras-base	2015-10-13 00:57:32 +02:00
Rex Dieter	7b8922bfca	kde: drop (deprecated) xsession stuff	2015-09-25 10:09:04 -05:00
Rex Dieter	4dd1659d02	add trailing / , to ensure we copy to dir and not as file	2015-09-25 09:48:47 -05:00
Rex Dieter	b899a6e8ef	kde: drop kdm reference	2015-09-25 09:20:25 -05:00
Rex Dieter	58fd2bb1b3	kde: drop reference to /etc/sysconfig/desktop deprecated long ago	2015-09-25 09:19:13 -05:00
Rex Dieter	3dc4603931	kde: update default favorites	2015-09-25 09:17:20 -05:00
Rex Dieter	93c87e947c	drop liveinst icon hack no longer needed, and needlessly invalidates icon cache	2015-09-25 09:14:15 -05:00
Rex Dieter	22c37e61ca	explicitly mkdir Desktop dir workaround https://bugzilla.redhat.com/show_bug.cgi?id=1266243	2015-09-25 09:12:33 -05:00
Peter Robinson	78114bb82f	adjust linux-firmware for cloud images	2015-09-23 07:16:18 +01:00
Rex Dieter	b44bc5a578	disable kwallet migrator	2015-09-21 20:16:13 -05:00
Kushal Das	ca778f7bc6	Removes extlinux parameter from bootloader information.	2015-09-15 02:49:38 +05:30
Dusty Mabe	29181aa376	cloud-base: workaround issue where langs are not getting installed. Workaround BZ1262040 by removing the --instLangs arg from the %packages line and rely on our previous hack to manually remove langs after install. This fixes BZ1261249. Signed-off-by: Kushal Das <kushaldas@gmail.com>	2015-09-15 02:45:50 +05:30
Luya Tshimbalanga	97fbfec937	design: use https for fpo address	2015-09-10 20:57:23 -07:00
Brendan Jones	aca277c870	Correct include, update ardour	2015-09-08 23:39:36 +02:00
David Ward	0ecfd28e29	fedora-live-base.ks: enable ModemManager service The ModemManager package is already installed for all live images; it should be enabled so users can connect to WWAN right after boot using the NetworkManager applet. Signed-off-by: David Ward <david.ward@ll.mit.edu>	2015-09-07 10:32:16 -06:00
Kevin Fenzi	a17b0e0933	Add ffado to jam spin. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1259053	2015-09-03 09:57:50 -06:00
Adam Miller	6ea47a9570	add tsflags=nodocs to dnf.conf as well as yum.conf	2015-09-01 15:55:14 -05:00
Colin Walters	f2c71083fe	atomic-installer: Use https by default Similar to https://git.fedorahosted.org/cgit/spin-kickstarts.git/commit/?id=1e408e111008f539c89212a9ca9bb955e2c4f823	2015-08-26 15:22:25 -04:00
Amit	3543c6c06a	scientific: pvm is retired	2015-08-17 22:15:54 +10:00
Luya Tshimbalanga	16ee97ef54	design-suite: temporarily removal of luxrender-blender due to broken dependency (rhbz #1253408 )	2015-08-13 09:26:35 -07:00
Dan Book	8d322093ec	menu items should be excluded by cinnamon now	2015-08-12 14:36:32 -04:00
Rex Dieter	54dd9b2395	kde: +firefox per https://lists.fedoraproject.org/pipermail/kde/2015-August/015363.html	2015-08-11 13:31:29 -05:00
Stephen Gallagher	987c20e3b4	Fedora Server: Include @networkmanager-submodules This is needed for optional installations including WiFI or WWAN	2015-08-10 14:23:37 -04:00
raveit65	cbf8ff5eb6	Mate: use f23 backgrounds	2015-08-07 16:31:46 +02:00
Stephen Gallagher	aeb995e9ad	Pull in @virtualization-headless instead of @virtualization	2015-08-06 08:47:15 -04:00
raveit65	dc042df773	Mate: add lightdm-gtk-greeter-settings	2015-07-30 17:25:56 +02:00
Bruno Wolff III	27454a96cd	Remove games that pull in fluid-soundfont-lite-patches fluid-soundfont-lite-patches is 200MB installed and we need some big cuts to get under size again.	2015-07-26 00:38:18 -05:00
Christian Dersch	becb8f7b89	Added kickstart file for Astronomy Spin	2015-07-25 20:13:19 +02:00
Bruno Wolff III	ddfcfc68fa	The name of the XFCE ks file changed	2015-07-24 11:37:16 -05:00
Adam Williamson	3d0080cf04	bump the KDE compose root size a bit KDE composes have been failing for weeks due to insufficient space in the compose root.	2015-07-22 08:42:00 -07:00
raveit65	d39c5a37b9	Mate: remove packagekit packages	2015-07-17 17:25:13 +02:00