Merge remote branch 'origin/4.3/1126'

This commit is contained in:
Zhi Li
2012-05-18 13:05:39 +08:00

View File

@@ -146,19 +146,19 @@ default 0
## Default menu entries
title LINX Rocky Secure Operating System Version $OSVERSION with root
kernel $root$boot/vmlinuz-root root=$root_dev $KPARAMETER
kernel $root$boot/vmlinuz-root root=$root_dev $KPARAMETER linx-root
initrd $boot/initrd.gz
title LINX Rocky Secure Operating System Version $OSVERSION without root
kernel $root$boot/vmlinuz-root-n root=$root_dev $KPARAMETER
kernel $root$boot/vmlinuz-root-n root=$root_dev $KPARAMETER linx-no-root
initrd $boot/initrd.gz
title LINX Rocky Secure Operating System Version $OSVERSION with root but no cgroup
kernel $root$boot/vmlinuz-root-nocgroup root=$root_dev $KPARAMETER
kernel $root$boot/vmlinuz-root-nocgroup root=$root_dev $KPARAMETER linx-root-nocgroup
initrd $boot/initrd-nocgroup.gz
title LINX Rocky Secure Operating System Version $OSVERSION without root but no cgroup
kernel $root$boot/vmlinuz-root-n-nocgroup root=$root_dev $KPARAMETER
kernel $root$boot/vmlinuz-root-n-nocgroup root=$root_dev $KPARAMETER linx-no-root-nocgroup
initrd $boot/initrd-nocgroup.gz
EOF
}