almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

runtime*.tmpl tweaks for conf.systemd

Browse Source
This commit is contained in:
Will Woods 2011-05-13 12:24:05 -04:00
parent 3d1155f946
commit 0f474a0e07
2 changed files with 55 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
share/runtime-cleanup.tmpl
View File

@ -226,10 +226,51 @@ remove "/var/yp"
## icons cache ## icons cache
remove "/usr/share/icons/*/icon-theme.cache" remove "/usr/share/icons/*/icon-theme.cache"
## systemd or not?
%if conf.systemd:
removepkg "ConsoleKit" "/lib/systemd/*"
removepkg "avahi" "/lib/systemd/*"
removepkg "chkconfig" "/sbin/chkconfig"
removepkg "chkconfig" "/usr/sbin/alternatives"
removepkg "chkconfig" "/usr/sbin/update-alternatives"
removepkg "chkconfig" "/var/lib/alternatives"
removepkg "firstboot" "/lib/systemd/*"
removepkg "firstboot" "/usr/sbin/*"
removepkg "firstboot" "/usr/share/firstboot/*"
removepkg "firstboot" "/usr/share/locale/*"
removepkg "initscripts" "/lib/systemd/system/fedora-readonly.service"
removepkg "initscripts" "/lib/systemd/system/fedora-storage-init.service"
removepkg "initscripts" "/lib/systemd/system/fedora-wait-storage.service"
removepkg "systemd-units" "/lib/systemd/system/bluetooth.target"
removepkg "systemd-units" "/lib/systemd/system/http-daemon.target"
removepkg "systemd-units" "/lib/systemd/system/kexec*"
removepkg "systemd-units" "/lib/systemd/system/local-fs.target.wants/media.mount"
removepkg "systemd-units" "/lib/systemd/system/mail-transfer-agent.target"
removepkg "systemd-units" "/lib/systemd/system/media.mount"
removepkg "systemd-units" "/lib/systemd/system/printer*"
removepkg "systemd-units" "/lib/systemd/system/*plymouth*"
removepkg "systemd-units" "/lib/systemd/system/quota*"
removepkg "systemd-units" "/lib/systemd/system/smartcard*"
removepkg "systemd-units" "/lib/systemd/system/systemd-remount-api-vfs.service"
%else:
remove "/cgroup"
remove "/var/cache"
remove "/var/log"
removepkg "chkconfig"
removepkg "filesystem"
removepkg "systemd-units"
removepkg "NetworkManager" "/lib/systemd/*"
removepkg "dbus" "/lib/systemd/*"
removepkg "initscripts" "/lib/systemd/*"
removepkg "systemd" "/bin/*"
removepkg "systemd" "/lib/systemd/*"
removepkg "systemd" "/usr/share/systemd/*"
removepkg "util-linux" "/sbin/agetty"
%endif
## other package specific removals ## other package specific removals
removepkg "ConsoleKit" "/etc/ConsoleKit*" removepkg "ConsoleKit" "/etc/ConsoleKit*"
removepkg "ConsoleKit" "/etc/init/*" removepkg "ConsoleKit" "/etc/init/*"
removepkg "ConsoleKit" "/lib/systemd/*"
removepkg "ConsoleKit" "/usr/bin/*" removepkg "ConsoleKit" "/usr/bin/*"
removepkg "ConsoleKit" "/usr/lib/*" removepkg "ConsoleKit" "/usr/lib/*"
removepkg "ConsoleKit" "/usr/sbin/*" removepkg "ConsoleKit" "/usr/sbin/*"
@ -273,7 +314,6 @@ removepkg "audit-libs" "/etc/*"
removepkg "audit-libs" "/${libdir}/libauparse*" removepkg "audit-libs" "/${libdir}/libauparse*"
removepkg "authconfig" "/usr/sbin/*" removepkg "authconfig" "/usr/sbin/*"
removepkg "authconfig" "/usr/share/*" removepkg "authconfig" "/usr/share/*"
removepkg "avahi" "/lib/systemd/*"
removepkg "avahi" "/usr/share/locale/*" removepkg "avahi" "/usr/share/locale/*"
removepkg "bash" "/etc/*" removepkg "bash" "/etc/*"
removepkg "bash" "/usr/bin/*" removepkg "bash" "/usr/bin/*"
@ -577,9 +617,6 @@ removepkg "hwdata" "/usr/share/hwdata/oui.txt"
removepkg "hwdata" "/usr/share/hwdata/pnp.ids" removepkg "hwdata" "/usr/share/hwdata/pnp.ids"
removepkg "hwdata" "/usr/share/hwdata/upgradelist" removepkg "hwdata" "/usr/share/hwdata/upgradelist"
removepkg "initscripts" "/etc/ppp/*" removepkg "initscripts" "/etc/ppp/*"
removepkg "initscripts" "/lib/systemd/system/fedora-readonly.service"
removepkg "initscripts" "/lib/systemd/system/fedora-storage-init.service"
removepkg "initscripts" "/lib/systemd/system/fedora-wait-storage.service"
removepkg "initscripts" "/usr/sbin/*" removepkg "initscripts" "/usr/sbin/*"
removepkg "initscripts" "/usr/share/locale/*" removepkg "initscripts" "/usr/share/locale/*"
removepkg "iproute" "/etc/*" removepkg "iproute" "/etc/*"

12
share/runtime-postinstall.tmpl
View File

@ -1,5 +1,4 @@
<%page args="root arch configdir"/> <%page args="root arch configdir"/>
## FIXME copy configdir into root before this
<% <%
KEYMAP_OVERRIDE = "usr/share/anaconda/keymaps-override-%s" % arch.basearch KEYMAP_OVERRIDE = "usr/share/anaconda/keymaps-override-%s" % arch.basearch
SCREENFONT = "usr/share/anaconda/screenfont-%s.gz" % arch.basearch SCREENFONT = "usr/share/anaconda/screenfont-%s.gz" % arch.basearch
@ -45,9 +44,19 @@ append etc/depmod.d/dd.conf "search updates built-in"
## misc_tree_modifications() ## misc_tree_modifications()
%if conf.systemd:
symlink "/sbin/init" init symlink "/sbin/init" init
remove etc/systemd/system/default.target remove etc/systemd/system/default.target
symlink "/lib/systemd/system/anaconda.target" etc/systemd/system/default.target symlink "/lib/systemd/system/anaconda.target" etc/systemd/system/default.target
install ${configdir}/network etc/sysconfig
%else:
copy usr/${libdir}/anaconda/shutdown sbin/shutdown
copy usr/${libdir}/anaconda/init sbin/init
symlink init sbin/halt
symlink init sbin/poweroff
symlink init sbin/reboot
remove sbin/runlevel sbin/shutdown sbin/telinit
%endif
append etc/resolv.conf "" append etc/resolv.conf ""
append bin/login "#!/bin/bash" append bin/login "#!/bin/bash"
append bin/login "exec -l /bin/bash" append bin/login "exec -l /bin/bash"
@ -75,7 +84,6 @@ install ${configdir}/libuser.conf etc
%if exists(root+"/etc/selinux/targeted"): %if exists(root+"/etc/selinux/targeted"):
install ${configdir}/selinux.config etc/selinux/config install ${configdir}/selinux.config etc/selinux/config
%endif %endif
install ${configdir}/network etc/sysconfig
## setup_sshd(configdir) ## setup_sshd(configdir)