From 1de4bff8c42a5ea632fc36ab8f8756738ed7153f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 25 Feb 2016 16:29:47 -0600 Subject: [PATCH 01/11] make the arm base / 3070 LXDE was too big and this keeps the image under 4GiB Signed-off-by: Dennis Gilmore --- fedora-arm-base.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks index d13e188..7adcfe8 100644 --- a/fedora-arm-base.ks +++ b/fedora-arm-base.ks @@ -9,7 +9,7 @@ bootloader extlinux part /boot --size=512 --fstype ext4 part swap --size=512 --fstype swap -part / --size=3000 --fstype ext4 +part / --size=3070 --fstype ext4 # make sure that initial-setup runs and lets us do all the configuration bits firstboot --reconfig From 8014b39df36900fc1650b26d41c80f1d1afd76f4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 25 Feb 2016 17:13:37 -0600 Subject: [PATCH 02/11] remove file that does not belong in the git repo Signed-off-by: Dennis Gilmore --- .sparkleshare | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .sparkleshare diff --git a/.sparkleshare b/.sparkleshare deleted file mode 100644 index cef02d8..0000000 --- a/.sparkleshare +++ /dev/null @@ -1 +0,0 @@ -d6afc629dc9311ebd79b4cedb2775531065ecb05 \ No newline at end of file From 534fd19ce0764b2e47feb547568478d834b4d11f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 29 Feb 2016 14:21:30 -0600 Subject: [PATCH 03/11] make sure that all the livecds and arm images have glibc-all-langpacks installed Signed-off-by: Dennis Gilmore --- fedora-arm-base.ks | 2 ++ fedora-live-base.ks | 2 ++ 2 files changed, 4 insertions(+) diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks index 7adcfe8..59a8053 100644 --- a/fedora-arm-base.ks +++ b/fedora-arm-base.ks @@ -41,6 +41,8 @@ dracut-config-generic # install uboot images uboot-images-armv7 +# make sure all the locales are available for inital0-setup and anaconda to work +glibc-all-langpacks %end %post diff --git a/fedora-live-base.ks b/fedora-live-base.ks index ea9079e..28904af 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -60,6 +60,8 @@ dracut-config-generic grub2-efi syslinux +# anaconda needs the locales available to run for different locales +glibc-all-langpacks %end %post From eac616bd35024aed66458469a986d6edcd3d301c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 29 Feb 2016 20:49:57 -0600 Subject: [PATCH 04/11] install only english support on the minimal arm image Signed-off-by: Dennis Gilmore --- fedora-arm-minimal.ks | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fedora-arm-minimal.ks b/fedora-arm-minimal.ks index 964979c..bbfdd90 100644 --- a/fedora-arm-minimal.ks +++ b/fedora-arm-minimal.ks @@ -9,6 +9,8 @@ part / --size=1279 --fstype ext4 -@dial-up -initial-setup-gui -generic-release* +-glibc-all-langpacks +glibc-langpack-en %end %post From c615ddf087fe8cc706ef50a351a9059ab188ace9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 29 Feb 2016 21:00:21 -0600 Subject: [PATCH 05/11] increate the size of some of teh arm images. the install was too big Signed-off-by: Dennis Gilmore --- fedora-arm-base.ks | 2 +- fedora-arm-mate.ks | 2 +- fedora-arm-workstation.ks | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks index 59a8053..8ef64ba 100644 --- a/fedora-arm-base.ks +++ b/fedora-arm-base.ks @@ -9,7 +9,7 @@ bootloader extlinux part /boot --size=512 --fstype ext4 part swap --size=512 --fstype swap -part / --size=3070 --fstype ext4 +part / --size=3584 --fstype ext4 # make sure that initial-setup runs and lets us do all the configuration bits firstboot --reconfig diff --git a/fedora-arm-mate.ks b/fedora-arm-mate.ks index 7c0b5c9..d436ac1 100644 --- a/fedora-arm-mate.ks +++ b/fedora-arm-mate.ks @@ -2,7 +2,7 @@ %include fedora-arm-xbase.ks %include fedora-mate-packages.ks -part / --size=5000 --fstype ext4 +part / --size=5500 --fstype ext4 %post echo -n "Enabling initial-setup gui mode on startup" diff --git a/fedora-arm-workstation.ks b/fedora-arm-workstation.ks index bff5895..c56a58a 100644 --- a/fedora-arm-workstation.ks +++ b/fedora-arm-workstation.ks @@ -2,7 +2,7 @@ %include fedora-arm-xbase.ks %include fedora-workstation-packages.ks -part / --size=5000 --fstype ext4 +part / --size=5500 --fstype ext4 %packages -initial-setup From b119d39e42acf12fd7fa506ff1d6d3bdd2a4a3e6 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Wed, 2 Mar 2016 01:21:02 +0100 Subject: [PATCH 06/11] astronomy: disabled kst until dependency issue with gsl 2.1 is fixed --- fedora-live-astronomy_kde.ks | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fedora-live-astronomy_kde.ks b/fedora-live-astronomy_kde.ks index d17604a..f88c090 100644 --- a/fedora-live-astronomy_kde.ks +++ b/fedora-live-astronomy_kde.ks @@ -133,9 +133,10 @@ mercurial-hgk dia gimp inkscape -kst -kst-docs -kst-fits +# Disabled temp. due to dependency issue with gsl 2.1 +#kst +#kst-docs +#kst-fits #Misc. Utils # icedtea-web to have webstart useful for VO tools From 2ab5ea67c11a5ad13c328bda4e19654c5a98283c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 2 Mar 2016 11:10:33 -0600 Subject: [PATCH 07/11] install trees are now defined in pungi-fedora Signed-off-by: Dennis Gilmore --- fedora-install-cloud.ks | 93 --------------------------- fedora-install-server.ks | 115 ---------------------------------- fedora-install-workstation.ks | 51 --------------- 3 files changed, 259 deletions(-) delete mode 100644 fedora-install-cloud.ks delete mode 100644 fedora-install-server.ks delete mode 100644 fedora-install-workstation.ks diff --git a/fedora-install-cloud.ks b/fedora-install-cloud.ks deleted file mode 100644 index 6a8da33..0000000 --- a/fedora-install-cloud.ks +++ /dev/null @@ -1,93 +0,0 @@ -# Kickstart file for composing the "Fedora Cloud" spin of Fedora (rawhide) -# Maintained by the Fedora Release Engineering team: -# https://fedoraproject.org/wiki/ReleaseEngineering -# mailto:rel-eng@lists.fedoraproject.org - -# Use a part of 'iso' to define how large you want your isos. -# Only used when composing to more than one iso. -# Default is 695 (megs), CD size. -# Listed below is the size of a DVD if you wanted to split higher. -#part iso --size=4998 - -# Add the repos you wish to use to compose here. At least one of them needs group data. - -# Only uncomment repo commands in one of the two following sections. -# Because the install kickstart doesn't use the updates repo and does -# 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 - -# 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 - -# Package manifest for the compose. Uses repo group metadata to translate groups. -# (default groups for the configured repos are added by --default) -# @base got renamed to @standard, but @base is still included by default by pungi. -%packages --default - -# pungi is an inclusive depsolver so that multiple packages are brought -# in to satisify dependencies and we don't always want that. So we use -# an exclusion list to cut out things we don't want - --kernel*debug* --kernel-kdump* --kernel-tools* --syslog-ng* --astronomy-bookmarks -# generic* would match generic-jms-ra, so don't 'simplify' this --generic-logos* --generic-release* --GConf2-dbus* --bluez-gnome --community-mysql* -# jruby used to be in this list, but springframework-context explicitly -# requires it, not just 'any ruby implemention' - please check for things -# on the image that require mvn(org.jruby:jruby) before adding jruby to -# this list again - adamw 2014/09 -#-jruby - -# core -kernel* -dracut-* - - -# Things needed for installation -@anaconda-tools -fedora-productimg-cloud --fedora-productimg-server --fedora-productimg-workstation - -# Packages to enable server images to run in cloud environments -@cloud-server -@core -@standard -@headless-management -@dogtag -@directory-server -@dns-server -@freeipa-server -@ftp-server -@guest-agents -@ha -@load-balancer -@mail-server -@mysql -@network-server -@smb-server -@sql-server -@web-server - -# Langpacks -autocorr-* -hunspell-* -hyphen-* -man-pages-* --gimp-help-* - -# Removals --PackageKit-zif --zif -%end diff --git a/fedora-install-server.ks b/fedora-install-server.ks deleted file mode 100644 index 2daa54b..0000000 --- a/fedora-install-server.ks +++ /dev/null @@ -1,115 +0,0 @@ -# Kickstart file for composing the "Fedora" spin of Fedora (rawhide) -# Maintained by the Fedora Release Engineering team: -# https://fedoraproject.org/wiki/ReleaseEngineering -# mailto:rel-eng@lists.fedoraproject.org - -# Use a part of 'iso' to define how large you want your isos. -# Only used when composing to more than one iso. -# Default is 695 (megs), CD size. -# Listed below is the size of a DVD if you wanted to split higher. -#part iso --size=4998 - -# Add the repos you wish to use to compose here. At least one of them needs group data. - -# Only uncomment repo commands in one of the two following sections. -# Because the install kickstart doesn't use the updates repo and does -# 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 - -# 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 - -# Package manifest for the compose. Uses repo group metadata to translate groups. -# (default groups for the configured repos are added by --default) -# @base got renamed to @standard, but @base is still included by default by pungi. -%packages --default - --fedora-productimg-cloud -fedora-productimg-server --fedora-productimg-workstation - -# pungi is an inclusive depsolver so that multiple packages are brought -# in to satisify dependencies and we don't always want that. So we use -# an exclusion list to cut out things we don't want - --kernel*debug* --kernel-kdump* --kernel-tools* --syslog-ng* --astronomy-bookmarks --generic-logos* --generic-release* --GConf2-dbus* --bluez-gnome --community-mysql* - -# core -kernel* -dracut-* - -# No desktops --cinnamon* --enlightenment* --gnome-shell --gnome-session --kde* --lightdm-kde --lightdm-razorqt -# Pulls in qt --oprofile-gui - --@legacy-fonts - --@multimedia - -## common stuff -@guest-agents -@standard -@core -@hardware-support -@networkmanager-submodules - -# Fedora Server. -# Including this causes the fedora-release-server package to be included, -# which in turn enables server-product-environment, and due to to its priority -# this will be the default environment. -@^server-product-environment -@server-product -@headless-management -@container-management -@domain-client -@server-hardware-support - -# Common server packages -@sql-server -@web-server - - -# Infrastructure Server -@freeipa-server -@mail-server -@smb-server -@virtualization-headless - -# “uservisible” groups we want to offer -@ansible-node -@editors - -# Things needed for installation -@anaconda-tools -fedora-productimg-server - -# Langpacks -autocorr-* -hunspell-* -man-pages-* --gimp-help-* - -# Removals --PackageKit-zif --zif -%end diff --git a/fedora-install-workstation.ks b/fedora-install-workstation.ks deleted file mode 100644 index 0c8ca76..0000000 --- a/fedora-install-workstation.ks +++ /dev/null @@ -1,51 +0,0 @@ -# Kickstart file for composing the "Fedora" spin of Fedora (rawhide) -# Maintained by the Fedora Release Engineering team: -# https://fedoraproject.org/wiki/ReleaseEngineering -# mailto:rel-eng@lists.fedoraproject.org - -# Use a part of 'iso' to define how large you want your isos. -# Only used when composing to more than one iso. -# Default is 695 (megs), CD size. -# Listed below is the size of a DVD if you wanted to split higher. -#part iso --size=4998 - -# Add the repos you wish to use to compose here. At least one of them needs group data. - -# Only uncomment repo commands in one of the two following sections. -# Because the install kickstart doesn't use the updates repo and does -# 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 - -# 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 - -%include fedora-workstation-packages.ks - -# Package manifest for the compose. Uses repo group metadata to translate groups. -# (default groups for the configured repos are added by --default) -# @base got renamed to @standard, but @base is still included by default by pungi. -%packages --default - -# pungi is an inclusive depsolver so that multiple packages are brought -# in to satisify dependencies and we don't always want that. So we use -# an exclusion list to cut out things we don't want --kernel*debug* --kernel-kdump* --kernel-tools* --astronomy-bookmarks --generic* - -# core -kernel* - -# Things needed for installation -@anaconda-tools --fedora-productimg-cloud --fedora-productimg-server -fedora-productimg-workstation - -%end From a42f2327e15f9b85a26685c1516b7676c6937775 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Thu, 3 Mar 2016 17:53:42 +0100 Subject: [PATCH 08/11] astronomy: added LabPlot as replacement for retired scidavis --- fedora-live-astronomy_kde.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-live-astronomy_kde.ks b/fedora-live-astronomy_kde.ks index f88c090..b2dcd21 100644 --- a/fedora-live-astronomy_kde.ks +++ b/fedora-live-astronomy_kde.ks @@ -137,6 +137,7 @@ inkscape #kst #kst-docs #kst-fits +LabPlot #Misc. Utils # icedtea-web to have webstart useful for VO tools From a08e27a87d45ec7b5428d0c172b5d1bb3c505366 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 4 Mar 2016 12:54:04 +0100 Subject: [PATCH 09/11] Revert "add @gnome-desktop to fedora-workstation-packages" @gnome-desktop addition was reverted in comps in commit db13483cc5bdb39b8d9f066e7706335fb9ae3048; this reverts it here too. This reverts commit 6b42371f723437214404c37366e7784004e12dc3. --- fedora-workstation-packages.ks | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora-workstation-packages.ks b/fedora-workstation-packages.ks index f593821..eceda57 100644 --- a/fedora-workstation-packages.ks +++ b/fedora-workstation-packages.ks @@ -11,7 +11,6 @@ @core @firefox @fonts -@gnome-desktop @guest-desktop-agents @hardware-support @libreoffice From 2d034dd1c619499ef53ac1ccc93755164447db0d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 5 Mar 2016 09:26:35 -0700 Subject: [PATCH 10/11] Nuke random seed in install, the new instance should make it's own. Fixes bug #1314879 --- fedora-live-base.ks | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 28904af..e28b3dc 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -310,6 +310,9 @@ rm -f /var/lib/rpm/__db* # make sure there aren't core files lying around rm -f /core* +# remove random seed, the newly installed instance should make it's own +rm -f /var/lib/systemd/random-seed + # convince readahead not to collect # FIXME: for systemd From ff8162790bb0e20dfc5e39bb89b4002832a05c40 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 5 Mar 2016 17:44:00 +0000 Subject: [PATCH 11/11] Nuke random seed in install for ARM images too, the new instance should make it's own. Fixes bug #1314879 --- fedora-arm-base.ks | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks index 8ef64ba..084a266 100644 --- a/fedora-arm-base.ks +++ b/fedora-arm-base.ks @@ -57,6 +57,9 @@ rpm -qa # Note that running rpm recreates the rpm db files which aren't needed or wanted rm -f /var/lib/rpm/__db* +# remove random seed, the newly installed instance should make it's own +rm -f /var/lib/systemd/random-seed + # Because memory is scarce resource in most arm systems we are differing from the Fedora # default of having /tmp on tmpfs. echo "Disabling tmpfs for /tmp."