X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=boot%2Fgrub%2Fmenu.lst;h=f4aaaca762443142e3c12e1febc3a6b0fd983bb2;hb=7f3c6490f16c65125f4a72aa7ad6bbbe774a9f89;hp=f26a2273b115ad6eeabe994a0fbf3260efedb6af;hpb=3a94f6132853350a4ec97a6762a2f3c1de2d1161;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/boot/grub/menu.lst b/boot/grub/menu.lst
index f26a227..f4aaaca 100644
--- a/boot/grub/menu.lst
+++ b/boot/grub/menu.lst
@@ -59,7 +59,7 @@ color cyan/blue white/blue
 ## e.g. kopt=root=/dev/hda1 ro
 ##      kopt_2_6_8=root=/dev/hdc1 ro
 ##      kopt_2_6_8_2_686=root=/dev/hdc2 ro
-# kopt=root=/dev/mapper/drsnuggles-root ro
+# kopt=root=/dev/mapper/drsnuggles-root ro console=ttyS0,115200 console=tty1
 
 ## default grub root device
 ## e.g. groot=(hd0,0)
@@ -113,30 +113,30 @@ color cyan/blue white/blue
 ## can be true or false
 # updatedefaultentry=false
 
+## should update-grub add savedefault to the default options
+## can be true or false
+# savedefault=false
+
 ## ## End Default Options ##
 
-title		Debian GNU/Linux, kernel 2.6.22.19-grsec2.1.11-vs2.2.0.7
+title		Debian GNU/Linux, kernel 2.6.22.19-vs2.2.0.7-grsec2.1.11-vs2.2.0.7
 root		(hd0,0)
-kernel		/vmlinuz-2.6.22.19-grsec2.1.11-vs2.2.0.7 root=/dev/mapper/drsnuggles-root ro 
-initrd		/initrd.img-2.6.22.19-grsec2.1.11-vs2.2.0.7
-savedefault
+kernel		/vmlinuz-2.6.22.19-vs2.2.0.7-grsec2.1.11-vs2.2.0.7 root=/dev/mapper/drsnuggles-root ro console=ttyS0,115200 console=tty1 
+initrd		/initrd.img-2.6.22.19-vs2.2.0.7-grsec2.1.11-vs2.2.0.7
 
-title		Debian GNU/Linux, kernel 2.6.22.19-grsec2.1.11-vs2.2.0.7 (single-user mode)
+title		Debian GNU/Linux, kernel 2.6.22.19-vs2.2.0.7-grsec2.1.11-vs2.2.0.7 (single-user mode)
 root		(hd0,0)
-kernel		/vmlinuz-2.6.22.19-grsec2.1.11-vs2.2.0.7 root=/dev/mapper/drsnuggles-root ro single
-initrd		/initrd.img-2.6.22.19-grsec2.1.11-vs2.2.0.7
-savedefault
+kernel		/vmlinuz-2.6.22.19-vs2.2.0.7-grsec2.1.11-vs2.2.0.7 root=/dev/mapper/drsnuggles-root ro console=ttyS0,115200 console=tty1 single
+initrd		/initrd.img-2.6.22.19-vs2.2.0.7-grsec2.1.11-vs2.2.0.7
 
 title		Debian GNU/Linux, kernel 2.6.18-6-686
 root		(hd0,0)
-kernel		/vmlinuz-2.6.18-6-686 root=/dev/mapper/drsnuggles-root ro 
+kernel		/vmlinuz-2.6.18-6-686 root=/dev/mapper/drsnuggles-root ro console=ttyS0,115200 console=tty1 
 initrd		/initrd.img-2.6.18-6-686
-savedefault
 
 title		Debian GNU/Linux, kernel 2.6.18-6-686 (single-user mode)
 root		(hd0,0)
-kernel		/vmlinuz-2.6.18-6-686 root=/dev/mapper/drsnuggles-root ro single
+kernel		/vmlinuz-2.6.18-6-686 root=/dev/mapper/drsnuggles-root ro console=ttyS0,115200 console=tty1 single
 initrd		/initrd.img-2.6.18-6-686
-savedefault
 
 ### END DEBIAN AUTOMAGIC KERNELS LIST