Permalink
Browse files

Disable selinux setup on centos during boot

Fixes an issue where /dev was mounted twice

[Delivers #58643330]

Signed-off-by: Jeffrey Peckham <peckham@pivotallabs.com>
  • Loading branch information...
1 parent 643b4e1 commit 710d3a1462edcc1816ee79c3096c449634285cc6 @monkeyherder monkeyherder committed Oct 18, 2013
@@ -115,6 +115,7 @@
it { should contain 'title CentOS release 6.4 (Final) (2.6.32-358.23.2.el6.x86_64)' }
it { should contain ' root (hd0,0)' }
it { should contain ' kernel /boot/vmlinuz-2.6.32-358.23.2.el6.x86_64 ro root=UUID=' }
+ it { should contain ' selinux=0' }
it { should contain ' initrd /boot/initramfs-2.6.32-358.23.2.el6.x86_64.img' }
end
@@ -126,6 +126,7 @@
it { should contain 'title Ubuntu 10.04.4 LTS (3.0.0-32-virtual)' }
it { should contain ' root (hd0,0)' }
it { should contain ' kernel /boot/vmlinuz-3.0.0-32-virtual ro root=UUID=' }
+ it { should contain ' selinux=0' }
it { should contain ' initrd /boot/initrd.img-3.0.0-32-virtual' }
end
@@ -68,7 +68,7 @@ default=0
timeout=1
title ${os_name} (${kernel_version})
root (hd0,0)
- kernel /boot/vmlinuz-${kernel_version} ro root=UUID=${uuid}
+ kernel /boot/vmlinuz-${kernel_version} ro root=UUID=${uuid} selinux=0
initrd /boot/${initrd_file}
GRUB_CONF

0 comments on commit 710d3a1

Please sign in to comment.