davidlt/fedora-kickstarts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't mount a tmpfs ourselves - use systemd's tmp.mount.

Browse Source 
We were mounting a tmpfs over a tmpfs, which aside from being redundant is appearing to cause some issues. (#857076)
This commit is contained in:
Bill Nottingham 2012-10-12 10:39:17 -04:00
parent 49e2f8cbb9
commit 600308e3be
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fedora-live-base.ks
View File

@ -159,9 +159,8 @@ fi
# make it so that we don't do writing to the overlay for things which # make it so that we don't do writing to the overlay for things which
# are just tmpdirs/caches # are just tmpdirs/caches
mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum
mount -t tmpfs tmp /tmp
mount -t tmpfs vartmp /var/tmp mount -t tmpfs vartmp /var/tmp
[ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /tmp /var/tmp >/dev/null 2>&1 [ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /var/tmp >/dev/null 2>&1
if [ -n "\$configdone" ]; then if [ -n "\$configdone" ]; then
exit 0 exit 0
@ -280,6 +279,9 @@ chmod 755 /etc/rc.d/init.d/livesys-late
/sbin/restorecon /etc/rc.d/init.d/livesys-late /sbin/restorecon /etc/rc.d/init.d/livesys-late
/sbin/chkconfig --add livesys-late /sbin/chkconfig --add livesys-late
# enable tmpfs for /tmp
systemctl enable tmp.mount
# work around for poor key import UI in PackageKit # work around for poor key import UI in PackageKit
rm -f /var/lib/rpm/__db* rm -f /var/lib/rpm/__db*
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora

6
fedora-live-mini.ks
View File

@ -203,9 +203,8 @@ fi
# make it so that we don't do writing to the overlay for things which # make it so that we don't do writing to the overlay for things which
# are just tmpdirs/caches # are just tmpdirs/caches
mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum
mount -t tmpfs tmp /tmp
mount -t tmpfs vartmp /var/tmp mount -t tmpfs vartmp /var/tmp
[ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /tmp /var/tmp >/dev/null 2>&1 [ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /var/tmp >/dev/null 2>&1
# comment to fix sugar startup # comment to fix sugar startup
#if [ -n "\$configdone" ]; then #if [ -n "\$configdone" ]; then
@ -332,6 +331,9 @@ chmod 755 /etc/rc.d/init.d/livesys-late
/sbin/restorecon /etc/rc.d/init.d/livesys-late /sbin/restorecon /etc/rc.d/init.d/livesys-late
/sbin/chkconfig --add livesys-late /sbin/chkconfig --add livesys-late
# enable tmpfs for /tmp
systemctl enable tmp.mount
# work around for poor key import UI in PackageKit # work around for poor key import UI in PackageKit
rm -f /var/lib/rpm/__db* rm -f /var/lib/rpm/__db*
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora