From 6ebbe2c19cc834f5337e0c389376a3c8e4acb4d6 Mon Sep 17 00:00:00 2001 From: Will Woods Date: Fri, 24 Jun 2011 18:09:44 -0400 Subject: [PATCH] remove f15 junk from runtime-cleanup --- share/runtime-cleanup.tmpl | 48 +++++++++++++++----------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl index 5caadaf4..ee6b92c6 100644 --- a/share/runtime-cleanup.tmpl +++ b/share/runtime-cleanup.tmpl @@ -78,35 +78,25 @@ arch/x86/kvm %endfor ## FIXME: run depmod, generate module-info -## remove systemd for F15, otherwise clean it up -%if int(product.version) == 15: - remove /cgroup /var/cache /var/log - removepkg chkconfig filesystem systemd-units - removefrom NetworkManager /lib/systemd/* - removefrom dbus /lib/systemd/* - removefrom initscripts /lib/systemd/* - removefrom systemd /bin/* /lib/systemd/* /usr/share/systemd/* - removefrom util-linux /sbin/agetty -%else: - removefrom ConsoleKit /lib/systemd/* - removefrom avahi /lib/systemd/* - removefrom chkconfig /sbin/chkconfig /usr/sbin/alternatives - removefrom chkconfig /usr/sbin/update-alternatives /var/lib/alternatives - removefrom initscripts /lib/systemd/system/fedora-readonly.service - removefrom initscripts /lib/systemd/system/fedora-storage-init.service - removefrom initscripts /lib/systemd/system/fedora-wait-storage.service - removefrom systemd-units /lib/systemd/system/bluetooth.target - removefrom systemd-units /lib/systemd/system/http-daemon.target - removefrom systemd-units /lib/systemd/system/kexec* - removefrom systemd-units /lib/systemd/system/local-fs.target.wants/media.mount - removefrom systemd-units /lib/systemd/system/mail-transfer-agent.target - removefrom systemd-units /lib/systemd/system/media.mount - removefrom systemd-units /lib/systemd/system/printer* - removefrom systemd-units /lib/systemd/system/*plymouth* - removefrom systemd-units /lib/systemd/system/quota* - removefrom systemd-units /lib/systemd/system/smartcard* - removefrom systemd-units /lib/systemd/system/systemd-remount-api-vfs.service -%endif +## Clean up systemd +removefrom ConsoleKit /lib/systemd/* +removefrom avahi /lib/systemd/* +removefrom chkconfig /sbin/chkconfig /usr/sbin/alternatives +removefrom chkconfig /usr/sbin/update-alternatives /var/lib/alternatives +removefrom initscripts /lib/systemd/system/fedora-readonly.service +removefrom initscripts /lib/systemd/system/fedora-storage-init.service +removefrom initscripts /lib/systemd/system/fedora-wait-storage.service +removefrom systemd-units /lib/systemd/system/bluetooth.target +removefrom systemd-units /lib/systemd/system/http-daemon.target +removefrom systemd-units /lib/systemd/system/kexec* +removefrom systemd-units /lib/systemd/system/local-fs.target.wants/media.mount +removefrom systemd-units /lib/systemd/system/mail-transfer-agent.target +removefrom systemd-units /lib/systemd/system/media.mount +removefrom systemd-units /lib/systemd/system/printer* +removefrom systemd-units /lib/systemd/system/*plymouth* +removefrom systemd-units /lib/systemd/system/quota* +removefrom systemd-units /lib/systemd/system/smartcard* +removefrom systemd-units /lib/systemd/system/systemd-remount-api-vfs.service ## other package specific removals removefrom ConsoleKit /etc/ConsoleKit* /etc/init/* /usr/bin/* /usr/lib/*