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

runtime-{postinstall,cleanup}: more F15 fixes

Browse Source 
* don't remove /usr/lib/locale and locale-archive in F15
* make sure /var/run isn't a symlink
This commit is contained in:
Will Woods 2011-07-07 18:38:55 -04:00
parent 2c80e5b773
commit e1edc65e62
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
share/runtime-cleanup.tmpl
View File

@ -56,11 +56,6 @@ remove /var/lib/rpm/* /var/lib/yum
## icons cache ## icons cache
remove /usr/share/icons/*/icon-theme.cache remove /usr/share/icons/*/icon-theme.cache
## remove generated locales - anaconda knows how to restore them at runtime
removefrom glibc-common /usr/lib/locale/*
## locale-archive is not in the glibc-common filelist
remove /usr/lib/locale/locale-archive
## clean up kernel modules ## clean up kernel modules
<% <%
removekmods = """ removekmods = """
@ -99,6 +94,10 @@ remove /modules/*/{build,source,*.map}
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
## remove generated locales - anaconda knows how to restore 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: %else:
## F15 - remove systemd init stuff ## F15 - remove systemd init stuff
remove /cgroup /var/cache /var/log remove /cgroup /var/cache /var/log
@ -108,6 +107,7 @@ remove /modules/*/{build,source,*.map}
removefrom initscripts /lib/systemd/* removefrom initscripts /lib/systemd/*
removefrom systemd /bin/* /lib/systemd/* /usr/share/systemd/* removefrom systemd /bin/* /lib/systemd/* /usr/share/systemd/*
removefrom util-linux /sbin/agetty removefrom util-linux /sbin/agetty
removefrom glibc-common /usr/share/i18n/*
%endif %endif
## other package specific removals ## other package specific removals

8
share/runtime-postinstall.tmpl
View File

@ -42,9 +42,11 @@ move etc/yum.repos.d etc/anaconda.repos.d
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/telinit
## Since systemd won't be creating paths for us.. ## Since systemd won't be setting up sockets in /run for us..
mkdir /var/run/dbus remove var/run
move run var
mkdir var/run/dbus
%endif %endif
symlink /sbin/init init symlink /sbin/init init
install ${configdir}/network etc/sysconfig install ${configdir}/network etc/sysconfig