From c0cf2095e40d771a2be5a4a93c015ceb5a57724c Mon Sep 17 00:00:00 2001 From: Will Woods Date: Fri, 24 Jun 2011 18:19:34 -0400 Subject: [PATCH] remove f15 junk from runtime-postinstall --- share/runtime-postinstall.tmpl | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl index b4b0f1d2..562d3649 100644 --- a/share/runtime-postinstall.tmpl +++ b/share/runtime-postinstall.tmpl @@ -29,19 +29,10 @@ move ${PYTHONDIR}/site-packages/pyanaconda/sitecustomize.py ${PYTHONDIR}/site-pa move etc/yum.repos.d etc/anaconda.repos.d ## misc_tree_modifications() -## set up our own init for F15, otherwise use systemd -%if int(product.version) == 15: - 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 -%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 +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 append etc/resolv.conf "" append bin/login "#!/bin/bash" append bin/login "exec -l /bin/bash"