drop workaround for pre-f16 anaconda's tmp.mount

This commit is contained in:
Will Woods 2011-11-02 15:02:11 -04:00
parent 3dde9f6316
commit 235962e30a

View File

@ -3,7 +3,7 @@
<%page args="root, basearch, libdir, configdir"/> <%page args="root, basearch, libdir, configdir"/>
<% <%
# TODO: fix filenames in anaconda so we can drop the ppc64 workaround # TODO: make systemd handle the keymaps and drop this from lorax/anaconda
filearch = 'ppc' if basearch == 'ppc64' else basearch filearch = 'ppc' if basearch == 'ppc64' else basearch
KEYMAP_OVERRIDE = "usr/share/anaconda/keymaps-override-%s" % filearch KEYMAP_OVERRIDE = "usr/share/anaconda/keymaps-override-%s" % filearch
PYTHONDIR = glob("usr/"+libdir+"/python?.?")[0] PYTHONDIR = glob("usr/"+libdir+"/python?.?")[0]
@ -34,8 +34,6 @@ move etc/yum.repos.d etc/anaconda.repos.d
remove etc/systemd/system/default.target remove etc/systemd/system/default.target
remove etc/systemd/system/default.target.wants/* remove etc/systemd/system/default.target.wants/*
symlink /lib/systemd/system/anaconda.target etc/systemd/system/default.target 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
## remove unwanted systemd services ## remove unwanted systemd services
removefrom systemd-units /lib/systemd/system/kexec* 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/local-fs.target.wants/media.mount