summarylogtreecommitdiffstats
path: root/menu.lst
diff options
context:
space:
mode:
authoryar2015-06-04 17:23:13 -0700
committeryar2015-07-03 17:00:55 -0700
commit1cf9a9a8d12f8028a8bf27e0cf28d9b3ebb189ee (patch)
treea5c8cab1d29ea114df7677a529b0b3547cb269d9 /menu.lst
parent7e756c52926ec7186830f09cfff894b808844b0b (diff)
downloadaur-1cf9a9a8d12f8028a8bf27e0cf28d9b3ebb189ee.tar.gz
kmem, swap accounting
swap accounting is still disabled by default, but now possible kmem stuff was just enabled by vanilla arch: https://bugs.archlinux.org/task/44847 https://projects.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/linux&id=9b5eb33c it's not clear why these were bundled together, actually. maybe they made a mistake.
Diffstat (limited to 'menu.lst')
-rw-r--r--menu.lst8
1 files changed, 4 insertions, 4 deletions
diff --git a/menu.lst b/menu.lst
index 8260178c69d..fd24f9e36b9 100644
--- a/menu.lst
+++ b/menu.lst
@@ -3,20 +3,20 @@ timeout 10
title Linux-Linode %VER%
root (hd0)
-kernel /boot/vmlinuz-linux-linode root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,journal=update,errors=remount-ro kaslr
+kernel /boot/vmlinuz-linux-linode root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,journal=update,errors=remount-ro swapaccount=0 kaslr
initrd /boot/initramfs-linux-linode.img
title Linux-Linode %VER% - rescue-ish
root (hd0)
-kernel /boot/vmlinuz-linux-linode root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,journal=update,errors=remount-ro break=postmount verbose
+kernel /boot/vmlinuz-linux-linode root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,journal=update,errors=remount-ro swapaccount=0 break=postmount verbose
initrd /boot/initramfs-linux-linode.img
title Arch Vanilla %VER% (if installed)
root (hd0)
-kernel /boot/vmlinuz-linux root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,journal=update,errors=remount-ro break=postmount verbose
+kernel /boot/vmlinuz-linux root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,journal=update,errors=remount-ro swapaccount=0 break=postmount verbose
initrd /boot/initramfs-linux.img
title Arch Vanilla %VER% Fallback (if installed)
root (hd0)
-kernel /boot/vmlinuz-linux root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,journal=update,errors=remount-ro break=postmount verbose
+kernel /boot/vmlinuz-linux root=/dev/xvda console=hvc0 loglevel=4 ro rootflags=noatime,nodiratime,data=journal,barrier=0,commit=5,journal=update,errors=remount-ro swapaccount=0 break=postmount verbose
initrd /boot/initramfs-linux-fallback.img