From 895a5aaf63e3a58035ebcb767569dc4be659b2a4 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 16 Sep 2009 14:53:23 +0000
Subject: setup-disk: add pax_nouderef boot param to vmware guests

---
 setup-disk.in | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/setup-disk.in b/setup-disk.in
index fc7efd4..a957b09 100644
--- a/setup-disk.in
+++ b/setup-disk.in
@@ -23,6 +23,11 @@ enumerate_fstab() {
 		sed "s:$mnt:/:g; s: :\t:g" | sed 's:/\+:/:g'
 }
 
+is_vmware() {
+	grep -q VMware /proc/scsi/scsi 2>/dev/null \
+		|| grep -q VMware /proc/ide/hd*/model 2>/dev/null
+}
+
 install_mounted_root() {
 	local mnt="$1"
 	local features="ata base bootchart cdrom ext2 ext3 ide scsi usb"
@@ -71,6 +76,12 @@ install_mounted_root() {
 	ln -s boot/grsec.gz "$mnt"/grsec.gz
 	ln -s boot/grsec "$mnt"/grsec
 
+	if is_vmware; then
+		pax_nouderef="pax_nouderef "
+	else
+		pax_nouderef=
+	fi
+
 	# create an extlinux.conf
 	cat >"$mnt"/boot/extlinux.conf <<EOF
 timeout 20
@@ -78,7 +89,7 @@ prompt 1
 default grsec
 label grsec
 	kernel /grsec
-	append initrd=/grsec.gz root=$rootdev modules=sd-mod,usb-storage,ext3$raidmod quiet
+	append initrd=/grsec.gz root=$rootdev modules=sd-mod,usb-storage,ext3$raidmod ${pax_nouderef}quiet
 EOF
 	# fix the fstab
 	enumerate_fstab "$mnt" >> "$mnt"/etc/fstab
-- 
cgit v1.2.3