projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b9dbe4c
)
Don't hardcode wm-ng as window manager for X
author
Christian Hofstaedtler
<ch@grml.org>
Thu, 8 Dec 2011 00:13:11 +0000
(
01:13
+0100)
committer
Christian Hofstaedtler
<ch@grml.org>
Thu, 8 Dec 2011 01:20:54 +0000
(
02:20
+0100)
templates/boot/grub/grub.cfg
patch
|
blob
|
history
templates/boot/isolinux/f5
patch
|
blob
|
history
templates/boot/isolinux/grml.cfg
patch
|
blob
|
history
templates/boot/isolinux/hidden.cfg
patch
|
blob
|
history
diff --git
a/templates/boot/grub/grub.cfg
b/templates/boot/grub/grub.cfg
index
7aac3ba
..
039ee6d
100644
(file)
--- a/
templates/boot/grub/grub.cfg
+++ b/
templates/boot/grub/grub.cfg
@@
-106,7
+106,7
@@
menuentry "%GRML_NAME% - copy whole medium to RAM" {
menuentry "%GRML_NAME% - start X by default" {
set gfxpayload=keep
menuentry "%GRML_NAME% - start X by default" {
set gfxpayload=keep
- linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet startx
=wm-ng
+ linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet startx
initrd /boot/%SHORT_NAME%/initrd.gz
}
initrd /boot/%SHORT_NAME%/initrd.gz
}
diff --git
a/templates/boot/isolinux/f5
b/templates/boot/isolinux/f5
index
8e04147
..
fec5c7d
100644
(file)
--- a/
templates/boot/isolinux/f5
+++ b/
templates/boot/isolinux/f5
@@
-8,7
+8,7
@@
grml noudev disable startup of udev (disables module loading)
grml services=foo1[,foo2] start specified service(s) [/etc/init.d/name foo1]
grml ssh=password set password for user grml and start ssh-server
grml noudev disable startup of udev (disables module loading)
grml services=foo1[,foo2] start specified service(s) [/etc/init.d/name foo1]
grml ssh=password set password for user grml and start ssh-server
- grml startx[=windowmanager]
autostart X.org via grml-x (default WM: wm-ng)
+ grml startx[=windowmanager]
autostart X.org using grml-x
grml swap activate present swap partitions
grml testcd check CD data integrity and md5sums
grml toram / grml2ram copy the whole CD/media to RAM and run from there
grml swap activate present swap partitions
grml testcd check CD data integrity and md5sums
grml toram / grml2ram copy the whole CD/media to RAM and run from there
diff --git
a/templates/boot/isolinux/grml.cfg
b/templates/boot/isolinux/grml.cfg
index
a3e8efa
..
bb8de19
100644
(file)
--- a/
templates/boot/isolinux/grml.cfg
+++ b/
templates/boot/isolinux/grml.cfg
@@
-83,7
+83,7
@@
label lang-de
label %GRML_NAME%x
menu label %GRML_NAME% - Graphical ^Mode
kernel /boot/%SHORT_NAME%/linux26
label %GRML_NAME%x
menu label %GRML_NAME% - Graphical ^Mode
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off quiet nomce startx
=wm-ng
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off quiet nomce startx
text help
Boot Grml and automatically invoke
text help
Boot Grml and automatically invoke
diff --git
a/templates/boot/isolinux/hidden.cfg
b/templates/boot/isolinux/hidden.cfg
index
1f85a2d
..
15b5e2e
100644
(file)
--- a/
templates/boot/isolinux/hidden.cfg
+++ b/
templates/boot/isolinux/hidden.cfg
@@
-21,7
+21,7
@@
append init=/sbin/bootchartd apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAM
label grmlx
menu hide
kernel /boot/%SHORT_NAME%/linux26
label grmlx
menu hide
kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off startx
=wm-ng
vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
+append apm=power-off startx vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce
label nofb
menu hide
label nofb
menu hide