projects
/
matthijs
/
servers
/
drsnuggles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vuurmuur: Accept ident connections to the host.
[matthijs/servers/drsnuggles.git]
/
boot
/
grub
/
menu.lst
diff --git
a/boot/grub/menu.lst
b/boot/grub/menu.lst
index f26a2273b115ad6eeabe994a0fbf3260efedb6af..f4aaaca762443142e3c12e1febc3a6b0fd983bb2 100644
(file)
--- 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
## 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)
## 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
## 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 ##
## ## 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)
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)
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)
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
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)
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
initrd /initrd.img-2.6.18-6-686
-savedefault
### END DEBIAN AUTOMAGIC KERNELS LIST
### END DEBIAN AUTOMAGIC KERNELS LIST