commit 600308e3be6a4b547f87db25740804abdd72c142 Author: Bill Nottingham notting@redhat.com Date: Fri Oct 12 10:39:17 2012 -0400
Don't mount a tmpfs ourselves - use systemd's tmp.mount.
We were mounting a tmpfs over a tmpfs, which aside from being redundant is appearing to cause some issues. (#857076)
fedora-live-base.ks | 6 ++++-- fedora-live-mini.ks | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) --- diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 71845e1..55ae05e 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -159,9 +159,8 @@ fi # make it so that we don't do writing to the overlay for things which # are just tmpdirs/caches mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum -mount -t tmpfs tmp /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 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/chkconfig --add livesys-late
+# enable tmpfs for /tmp +systemctl enable tmp.mount + # work around for poor key import UI in PackageKit rm -f /var/lib/rpm/__db* rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora diff --git a/fedora-live-mini.ks b/fedora-live-mini.ks index 8222486..7572df5 100644 --- a/fedora-live-mini.ks +++ b/fedora-live-mini.ks @@ -203,9 +203,8 @@ fi # make it so that we don't do writing to the overlay for things which # are just tmpdirs/caches mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum -mount -t tmpfs tmp /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 #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/chkconfig --add livesys-late
+# enable tmpfs for /tmp +systemctl enable tmp.mount + # work around for poor key import UI in PackageKit rm -f /var/lib/rpm/__db* rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora