making cloud images is easier if we include the base

we should no be able to exclude gimp-help
Revert "this breaks compose, need to revert" This reverts commit d6a2350a39.
2025-12-10 00:50:32 +08:00 · 2013-11-01 16:48:21 -05:00 · 2013-10-31 14:32:34 -05:00 · 2013-10-27 00:32:45 +02:00 · 2013-10-26 08:41:43 -05:00 · 2013-10-24 07:48:37 +02:00
10 changed files with 70 additions and 53 deletions
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -23,8 +23,6 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=ne
 kernel
 kernel-lpae

-dracut-config-generic
-
 chrony
 arm-boot-config
 extlinux-bootloader
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -19,17 +19,19 @@ auth --useshadow --enablemd5
 selinux --enforcing
 rootpw --lock --iscrypted locked

-firewall --disabled
+# this is actually not used, but a static firewall
+# matching these rules is generated below.
+firewall --service=ssh

 bootloader --timeout=1 --append="console=ttyS0,115200n8 console=tty0" extlinux

 network --bootproto=dhcp --device=eth0 --onboot=on
-services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final


 zerombr
 clearpart --all
-part / --size 1000 --fstype ext4
+part / --size 2048 --fstype ext4

 %include fedora-repo.ks

@@ -61,6 +63,10 @@ syslinux-extlinux
 # Needed initially, but removed below.
 firewalld

+# Basic firewall. If you're going to rely on your cloud service's
+# security groups you can remove this.
+iptables-services
+
 # cherry-pick a few things from @standard
 tar
 rsync
@@ -129,6 +135,28 @@ yum -C -y remove linux-firmware
 echo "Removing firewalld."
 yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"

+# Non-firewalld-firewall
+echo -n "Writing static firewall"
+cat <<EOF > /etc/sysconfig/iptables
+# Simple static firewall loaded by iptables.service. Replace
+# this with your own custom rules, run lokkit, or switch to 
+# shorewall or firewalld as your needs dictate.
+*filter
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+-A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
+-A INPUT -p icmp -j ACCEPT
+-A INPUT -i lo -j ACCEPT
+-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT
+#-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 80 -j ACCEPT
+#-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 443 -j ACCEPT
+-A INPUT -j REJECT --reject-with icmp-host-prohibited
+-A FORWARD -j REJECT --reject-with icmp-host-prohibited
+COMMIT
+EOF
+echo .
+
 # Another one needed at install time but not after that, and it pulls
 # in some unneeded deps (like, newt and slang)
 echo "Removing authconfig."
--- a/fedora-desktop-packages.ks
+++ b/fedora-desktop-packages.ks
@@ -20,4 +20,12 @@ nss-mdns
 # https://lists.fedoraproject.org/pipermail/devel/2013-July/186796.html
 -rsyslog

+# Remove a few apps that are being presented as featured apps in
+# gnome-software
+-transmission-gtk
+-simple-scan
+-gnome-photos
+-gnome-maps
+-gnome-weather
+
 %end
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.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
-repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch

 # 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
-#repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch

 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
--- a/fedora-live-design-suite.ks
+++ b/fedora-live-design-suite.ks
@@ -4,7 +4,7 @@
 # - A Spin targeted towards professional designers
 # Website: http://fedoraproject.org/wiki/Design_Suite
 # Maintainers:
-# - Luya Tshimbalanga <luya AT fedoraproject DOT org>
+# - Luya Tshimbalanga <sdz AT fedoraproject DOT org>
 # - Previous maintainer Sebastian Dziallas

 %include fedora-live-desktop.ks
@@ -27,8 +27,6 @@ font-manager
 gimp
 gimp-*-plugin
 gimp-data-extras
-gimp-gap
-gimp-paint-studio
 gimp-high-pass-filter
 gimp-normalmap
 gimp-resynthesizer
@@ -58,6 +56,10 @@ filezilla
 audacity
 pitivi

+# system
+# gtk-recordmydesktop # dropped for space (#887991)
+# network-manager-applet #part of Gnome Desktop
+
 # fonts
 aajohan-comfortaa-fonts
 adobe-source-sans-pro-fonts
@@ -99,7 +101,7 @@ overpass-fonts
 #Override the favorite desktop application in Dash
 cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'evolution.desktop', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop']
 #Enable categories in Gnome Shell
 app-folder-categories=['Utilities', 'Sundry', 'Office', 'Network', 'Internet', 'Graphics', 'Games', 'Multimedia', 'System', 'Development', 'Accessories', 'System Settings', 'Other']
 FOE
@@ -117,23 +119,26 @@ Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/inkscape-course.desktop

-# Add link to lists of tutorials
+<<<<<<< HEAD
+=======
+# Add link to the list of design tutorials
 cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 [Desktop Entry]
 Name=List of design tutorials
-GenericName=List of Tutorials for Designers
-Comment=Reference of Design Related Tutorials
-Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials
+GenericName=Design tutorials
+Comment=List of websites using open source design software
+Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
 Type=Application
 Icon=applications-graphics
 Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/list-design-tutorials.desktop

+>>>>>>> 6d05550... design: fix link for tutorials
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas

-#EOF
+EOF

 %end

--- a/fedora-live-jam-kde.ks
+++ b/fedora-live-jam-kde.ks
@@ -76,7 +76,7 @@ sooperlooper

 #recodring and DAW
 audacity
-ardour3
+ardour
 rosegarden4
 seq24
 muse
@@ -124,9 +124,6 @@ lv2-triceratops
 lv2-newtonator
 lv2-x42-plugins
 lv2-fomp-plugins
-lv2-sorcer
-lv2-fabla
-lv2-artyfx-plugins

 #dssi
 nekobee-dssi
--- a/fedora-livecd-mate-compiz.ks
+++ b/fedora-livecd-mate-compiz.ks
@@ -11,27 +11,8 @@
 -planner

 # Drop things for size
-@3d-printing
-brasero
-bluez
-bluez-cups
-@dial-up
-dnf
 -firefox
-gnome-bluetooth-libs
-gnome-icon-theme-symbolic
-gnome-software
-gnome-user-docs
-@guest-desktop-agents
 -@libreoffice
-@mate-applications
-mate-bluetooth
-mate-icon-theme-faenza
-transmission-gtk
-
-# Drop oversized fonts that aren't needed
-cjkuni-uming-fonts
-wqy-zenhei-fonts

 # A web browser would be nice for a live cd
 midori
@@ -84,8 +65,8 @@ midori
 -ntsysv

 # Drop some system-config things
+-system-config-boot
 -system-config-language
-system-config-printer
 -system-config-rootpassword
 -system-config-services
 -policycoreutils-gui
@@ -97,3 +78,4 @@ midori
 rm -f /usr/share/icons/HighContrast/icon-theme.cache

 %end
+
--- a/fedora-livecd-security.ks
+++ b/fedora-livecd-security.ks
@@ -24,14 +24,15 @@ part / --size 10240
 %packages
@xfce-desktop
@xfce-apps
+#@xfce-extra-plugins
+#@xfce-media
+#@xfce-office
+#@firefox

 # Security tools (not ready at the moment)
@security-lab
 security-menus

-# unlock default keyring. FIXME: Should probably be done in comps
-gnome-keyring-pam
-
 # save some space
 -autofs
 -acpid
@@ -40,16 +41,13 @@ gnome-keyring-pam
 -realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 -aspell-*                   # dictionaries are big
-gnumeric
-foomatic-db-ppds
-foomatic
-stix-fonts
-ibus-typing-booster
-xfce4-sensors-plugin
 -man-pages-*

 # drop some system-config things
+-system-config-boot
+#-system-config-network
 -system-config-rootpassword
+#-system-config-services
 -policycoreutils-gui

 # exclude some packages to save some space
--- 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
--- a/fedora-soas-packages.ks
+++ b/fedora-soas-packages.ks
@@ -70,5 +70,6 @@ livecd-tools
 -plymouth-system-theme
 -plymouth-theme-charge
 sugar-logos
+-sugar-write

 %end
Author	SHA1	Message	Date
Dennis Gilmore	a26624ed9b	making cloud images is easier if we include the base	2013-11-01 16:48:21 -05:00
Dennis Gilmore	50d56638a4	we should no be able to exclude gimp-help Revert "this breaks compose, need to revert" This reverts commit `d6a2350a39`.	2013-10-31 14:32:34 -05:00
Kevin Kofler	f111c49a16	fedora-live*-kde.ks: Completely remove references to kaffeine. They were already commented out. Now that kaffeine is gone from Fedora, they are not going to come back.	2013-10-27 00:32:45 +02:00
Dennis Gilmore	75b3a92964	add cloud image kickstarts, pulled from the cloud-kickstart repo, we have different snippets per arch because they need different kernels	2013-10-26 08:41:43 -05:00
Brendan Jones	c69f0a4e2d	Jam: add new lv2 plugins, aj-snapshot	2013-10-24 07:48:37 +02:00
Peter Robinson	47b27db344	SoaS: drop write for the moment	2013-10-23 20:07:24 +01:00
Peter Robinson	8db08b9dc9	SoaS: add FotoToon	2013-10-23 17:36:06 +01:00
Adam Williamson	1021a05fd1	fix and simplify setting of firefox homepage in qa-test-day.ks	2013-10-22 09:14:47 -07:00
Bruno Wolff III	dcebd2c540	Use git version to get version name Using git version is simpler as it handles oddball cases internally. Since we have been using mostly lightweight tags I have set it to search those in addition to annotated tags for the best match. The output for commits that don't have a tag seems a bit nicer as well. Conflicts: Makefile	2013-10-18 15:17:25 -05:00
Dennis Gilmore	d22816d5ff	install dracut-config-generic on arm images to get a generic initramfs remove it in %post so updates get host only initramfs's	2013-10-16 21:58:04 -05:00
Kalev Lember	9b3251521f	Adapt for changed rpm gpg key names	2013-10-17 00:15:15 +02:00
Luya Tshimbalanga	41cdac9e94	fixed icon access for tutorials	2013-10-15 23:15:55 -07:00
Dennis Gilmore	d6a2350a39	this breaks compose, need to revert Revert "Drop gimp-help, b/c it's huge. (#1000891)" This reverts commit `779c417bcd`.	2013-10-13 23:20:55 -05:00
Matthias Clasen	aac93c046a	Desktop: drop prelink We're still oversize, and prelink is generally unloved.	2013-10-08 12:59:14 -04:00
Matthias Clasen	aeb2bf2034	desktop: drop gnome-boxes and gnome-dictionary We're oversize, and we have a nice application installer now. Having boxes no the spin causes some problems wrt to network configuration, anyway.	2013-10-08 12:55:42 -04:00
Rex Dieter	d94cd77007	kde: SDDM doesn't start (#1015048 )	2013-10-03 10:07:12 -05:00
Bill Nottingham	779c417bcd	Drop gimp-help, b/c it's huge. (#1000891 )	2013-10-03 10:50:26 -04:00
Amit Saha	c8dc4f13f5	Scientific: Increase install root size	2013-10-03 16:24:59 +10:00
Fabian Affolter	8011bf222f	increse part size same as in f21	2013-10-01 23:33:46 +02:00
Fabian Affolter	4ab5d14b10	remove more pkgs	2013-10-01 23:30:58 +02:00
Peter Robinson	37589abe3d	Merge branch 'f20' of ssh://git.fedorahosted.org/git/spin-kickstarts into f20	2013-09-25 01:08:48 +01:00
Peter Robinson	59142fcc92	SoaS: add lightdm as it's not pulled in by lightdm-gtk anymore it seems	2013-09-25 01:08:04 +01:00
Luya Tshimbalanga	e4975f4c09	design: fix link for tutorials Conflicts: fedora-live-design-suite.ks	2013-09-17 11:34:53 -07:00
Fabian Affolter	77f0bcbfd2	remove more pkgs to save space	2013-09-16 22:19:29 +02:00
Shakthi Kannan	02b55984ec	Increase FEL DVD payload size to 10240	2013-09-16 06:07:44 +05:30
Amit Saha	a29472b8c8	Scientific: Increase the part size	2013-09-12 17:28:23 +10:00
Kevin Fenzi	b6b2f1c8b1	Drop kbluetooth and rdesktop for now from e-lab to get things testable.	2013-09-11 09:48:23 -06:00
Amit Saha	f110c70651	Scientific: Add back sagemath. Fix: https://bugzilla.redhat.com/show_bug.cgi?id=1006230	2013-09-11 11:41:39 +10:00
Luya Tshimbalanga	359cf00301	design: temporarily remove rdesktop	2013-09-10 16:05:46 -07:00
Amit Saha	84f578fcfc	Scientific: including sage fails depcheck for no clear reason	2013-09-10 13:02:05 +10:00
Amit Saha	9d08686776	Scientific: Add sagemath	2013-09-09 09:39:57 +10:00
Amit Saha	a60ccfaea5	Scientific: firefox deps are now fixed	2013-09-06 15:21:31 +10:00
Peter Robinson	b8706aa425	SoaS: add lightdm-gtk	2013-09-05 23:23:33 +01:00
Peter Robinson	060a19dc48	update sugar	2013-09-05 23:18:41 +01:00
Amit Saha	3b11ed5a50	Scientific: Remove matplotlib's wx backend	2013-09-06 08:12:23 +10:00
Matthias Clasen	1afc133c89	desktop: we don't need uboot-tools on the desktop spin	2013-09-05 17:44:44 -04:00
Amit Saha	9a220d6fa2	Scientific: Add Python 3 packages. Disabling torque for now.	2013-09-05 17:06:11 +10:00
Brendan Jones	f0b7758285	Jam: add new non-* packages	2013-09-04 06:19:07 +02:00
Amit Saha	0458ba8098	Scientific: Include additional packages Disable firefox for now.	2013-09-03 13:06:12 +10:00
Kevin Kofler	f573b2905b	fedora-live-kde-base.ks: fix #1003619 (SDDM autologin) Set SDDM rather than KDM to autologin liveuser on the KDE live image. Patch by Martin Bříza.	2013-09-02 22:47:24 +02:00
Matthias Clasen	b8dca705d6	desktop: Remove a few apps Remove apps that are being presented as 'featured' in gnome-softwared.	2013-09-02 12:55:12 -04:00
Bruno Wolff III	13a77ad28b	Add missing 'f' to updates and testing repo urls	2013-08-31 08:09:27 -05:00
Luya Tshimbalanga	96b509716f	design: fixes group	2013-08-30 11:51:02 -07:00
Dennis Gilmore	7e9439c5f0	make / bigger on KDE images	2013-08-28 20:27:31 -05:00
Adam Williamson	802966ff92	add workaround for #679486 from kparal (see comment #86 )	2013-08-28 09:29:06 -05:00
Dennis Gilmore	e10a135b4d	setup extlinux bootloader on arm images	2013-08-26 23:11:14 -05:00
Dennis Gilmore	69cd14ecc8	increase the size of the / partitions for Desktop and Mate images	2013-08-26 20:56:30 -05:00
Dennis Gilmore	3edb2534c5	target 2gb for minimal images so they can be installed into beaglebone black nand	2013-08-26 17:18:27 -05:00
Kevin Kofler	f340f0eddf	fedora-livecd-kde.ks: Bump payload size. Also update the comments at the top of fedora-live-kde.ks and fedora-livecd-kde.ks, it's been ages since "livecd-kde" last fit on an actual CD, the target size is 1 GiB now.	2013-08-26 16:17:54 +02:00
Adam Williamson	d356510dc3	make fedora-repo.ks consistent with the actual filename	2013-08-21 16:51:19 -07:00
Bruno Wolff III	6ac1f99024	Switch over repos for branch	2013-08-20 21:31:04 -05:00