projects
/
grml2usb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2534968
)
sync grub.cfg menu entries with grml-live templates
author
Christian Hofstaedtler
<ch@grml.org>
Sun, 11 Dec 2011 02:46:58 +0000
(
03:46
+0100)
committer
Christian Hofstaedtler
<ch@grml.org>
Sun, 11 Dec 2011 02:46:58 +0000
(
03:46
+0100)
grml2usb
patch
|
blob
|
history
diff --git
a/grml2usb
b/grml2usb
index
c978212
..
0233eda
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-420,62
+420,62
@@
def generate_flavour_specific_grub2_config(grml_flavour, bootoptions):
return("""\
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
return("""\
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s
- boot in default mode" {
+menuentry "%(grml_flavour)s - boot in default mode" {
set gfxpayload=1024x768x16,1024x768
linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
set gfxpayload=1024x768x16,1024x768
linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s
-persistent - enable persistency featur
e" {
+menuentry "%(grml_flavour)s
- enable persistent mod
e" {
set gfxpayload=1024x768x16,1024x768
linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet persistent live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
set gfxpayload=1024x768x16,1024x768
linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet persistent live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s
2ram - copy compressed grml file
to RAM" {
+menuentry "%(grml_flavour)s
- copy Grml
to RAM" {
set gfxpayload=1024x768x16,1024x768
linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s.squashfs bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
set gfxpayload=1024x768x16,1024x768
linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s.squashfs bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s
-debug - enable debugging options
" {
+menuentry "%(grml_flavour)s
- start X Window System
" {
set gfxpayload=1024x768x16,1024x768
set gfxpayload=1024x768x16,1024x768
- linux
/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ debug bootid=%(uid)s initcall_debug
%(bootoptions)s
+ linux
/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ startx bootid=%(uid)s
%(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s-x - start X Window System" {
- set gfxpayload=1024x768x16,1024x768
- linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ startx=wm-ng bootid=%(uid)s %(bootoptions)s
+menuentry "%(grml_flavour)s - disable framebuffer" {
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal video=ofonly bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s
-nofb - disable framebuffer
" {
- linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/
vga=normal video=ofonly bootid=%(uid)s %(bootoptions)s
+menuentry "%(grml_flavour)s
- disable Kernel Mode-Setting
" {
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/
bootid=%(uid)s %(bootoptions)s radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s-nokms - disable Kernel Mode-Setting" {
- linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset
+menuentry "%(grml_flavour)s - forensic mode" {
+ set gfxpayload=1024x768x16,1024x768
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ nofstab noraid nolvm noautoconfig noswap raid=noautodetect forensic readonly bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s
-failsafe
- disable hardware detection" {
+menuentry "%(grml_flavour)s - disable hardware detection" {
linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off pci=nomsi bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off pci=nomsi bootid=%(uid)s %(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
-menuentry "%(grml_flavour)s
-forensic - do not touch harddisks during hw recognition
" {
+menuentry "%(grml_flavour)s
- enable debugging options
" {
set gfxpayload=1024x768x16,1024x768
set gfxpayload=1024x768x16,1024x768
- linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/
nofstab noraid nolvm noautoconfig noswap raid=noautodetect forensic readonly bootid=%(uid)s
%(bootoptions)s
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/
debug bootid=%(uid)s initcall_debug
%(bootoptions)s
initrd /boot/release/%(flavour_filename)s/initrd.gz
}
initrd /boot/release/%(flavour_filename)s/initrd.gz
}