From 6962fe3e80037cb266e122c709c772d7d30180ce Mon Sep 17 00:00:00 2001 From: Will Woods Date: Tue, 9 Aug 2011 17:39:07 -0400 Subject: [PATCH] move systemd cleanup to runtime-postinstall also make sure we clean a bunch more unneeded services, but don't bother deleting target files that would just be ignored anyway. also also, delete everything in /etc/systemd/system/default.target.wants so that we don't get readahead stuff in anaconda. --- share/runtime-cleanup.tmpl | 44 ++++------------------------------ share/runtime-postinstall.tmpl | 20 ++++++++++++++++ 2 files changed, 24 insertions(+), 40 deletions(-) diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl index 9b087a30..78a30f76 100644 --- a/share/runtime-cleanup.tmpl +++ b/share/runtime-cleanup.tmpl @@ -78,40 +78,15 @@ arch/x86/kvm remove /modules/*/kernel/${kmodpath} %endfor remove /modules/*/{build,source,*.map} +## NOTE: depmod gets re-run after cleanup finishes +## clean up glibc locale files %if int(product.version) > 15: - ## 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 - ## remove generated locales - anaconda knows how to restore them at runtime + ## remove generated locales - anaconda >=16.x builds them at runtime removefrom glibc-common /usr/lib/locale/* - ## locale-archive is not in the glibc-common filelist remove /usr/lib/locale/locale-archive %else: - ## F15 - remove systemd init stuff - 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 + ## remove locale source files removefrom glibc-common /usr/share/i18n/* %endif @@ -374,17 +349,6 @@ removefrom smartmontools /usr/share/smartmontools/* removefrom sqlite /usr/bin/* removefrom system-config-date /etc/* /usr/bin/* /usr/share/icons/* removefrom system-config-keyboard /etc/* /usr/bin/* /usr/share/icons/* -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 removefrom sysvinit-tools /usr/bin/* removefrom tar /usr/share/locale/* removefrom un-core-dotum-fonts /usr/share/fonts/un-core/UnDotumBold.ttf diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl index 6b4996e7..bf308fd6 100644 --- a/share/runtime-postinstall.tmpl +++ b/share/runtime-postinstall.tmpl @@ -37,6 +37,7 @@ move etc/yum.repos.d etc/anaconda.repos.d %if int(product.version) > 15: ## Configure systemd to start anaconda remove etc/systemd/system/default.target + remove etc/systemd/system/default.target.wants/* symlink /lib/systemd/system/anaconda.target etc/systemd/system/default.target ## workaround: /tmp is writeable, so we don't need tmp.mount replace tmp.mount "" /lib/systemd/system/loader.service @@ -60,7 +61,26 @@ move etc/yum.repos.d etc/anaconda.repos.d symlink run/lock var/lock ## Since systemd won't be setting up sockets in /run for us.. mkdir var/run/dbus + ## remove systemd init stuff + remove /cgroup /var/cache /var/log + removepkg systemd-units + removefrom NetworkManager /lib/systemd/* + removefrom dbus /lib/systemd/* + removefrom systemd /bin/* /lib/systemd/* /usr/share/systemd/* + removefrom util-linux /sbin/agetty %endif +## remove unwanted systemd services +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/media.mount +removefrom systemd-units /lib/systemd/system/*plymouth* +removefrom systemd-units /lib/systemd/system/quota*.service +removefrom systemd-units /lib/systemd/system/systemd-remount-api-vfs.service +removefrom ConsoleKit /lib/systemd/system/* +removefrom initscripts /lib/systemd/system/fedora* /lib/systemd/fedora* +removefrom lvm2 /lib/systemd/system/* +removefrom mdadm /lib/systemd/system/* +## finally, make /init -> /sbin/init symlink symlink /sbin/init init ## install some basic configuration files