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

template fixup: use product.version instead of conf.systemd

Browse Source
This commit is contained in:
Will Woods 2011-05-26 14:21:13 -04:00
parent 87546a1f12
commit 51472dee28
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
share/runtime-cleanup.tmpl
View File

@ -226,8 +226,16 @@ remove /var/yp
## icons cache ## icons cache
remove /usr/share/icons/*/icon-theme.cache remove /usr/share/icons/*/icon-theme.cache
## systemd or not? ## remove systemd for F15, otherwise clean it up
%if conf.systemd: %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 ConsoleKit /lib/systemd/*
removefrom avahi /lib/systemd/* removefrom avahi /lib/systemd/*
removefrom chkconfig /sbin/chkconfig removefrom chkconfig /sbin/chkconfig
@ -252,14 +260,6 @@ remove /usr/share/icons/*/icon-theme.cache
removefrom systemd-units /lib/systemd/system/quota* removefrom systemd-units /lib/systemd/system/quota*
removefrom systemd-units /lib/systemd/system/smartcard* removefrom systemd-units /lib/systemd/system/smartcard*
removefrom systemd-units /lib/systemd/system/systemd-remount-api-vfs.service removefrom systemd-units /lib/systemd/system/systemd-remount-api-vfs.service
%else:
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
%endif %endif
## other package specific removals ## other package specific removals

13
share/runtime-postinstall.tmpl
View File

@ -44,18 +44,19 @@ append etc/depmod.d/dd.conf "search updates built-in"
## misc_tree_modifications() ## misc_tree_modifications()
%if conf.systemd: ## set up our own init for F15, otherwise use systemd
symlink "/sbin/init" init %if int(product.version) == 15:
remove 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/shutdown sbin/shutdown
copy usr/${libdir}/anaconda/init sbin/init copy usr/${libdir}/anaconda/init sbin/init
symlink init sbin/halt symlink init sbin/halt
symlink init sbin/poweroff symlink init sbin/poweroff
symlink init sbin/reboot symlink init sbin/reboot
remove sbin/runlevel sbin/shutdown sbin/telinit remove sbin/runlevel sbin/shutdown sbin/telinit
%else:
symlink "/sbin/init" init
remove etc/systemd/system/default.target
symlink "/lib/systemd/system/anaconda.target" etc/systemd/system/default.target
install ${configdir}/network etc/sysconfig
%endif %endif
append etc/resolv.conf "" append etc/resolv.conf ""
append bin/login "#!/bin/bash" append bin/login "#!/bin/bash"