openmamba/makedist-openmamba-milestone2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync some changes from openmamba (devel) branch

Browse Source
This commit is contained in:
Silvan Calarco 2011-07-22 16:17:51 +02:00
parent 0b1a3bc1fe
commit 309a9da2fa
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.defs
View File

@ -26,7 +26,7 @@ xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia xorg-ext-libglx-nvidia_71xx
libGLcore.so.1 = xorg-drv-video-nvidia xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx libGLcore.so.1 = xorg-drv-video-nvidia xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx
libnvidia-tls.so.1 = xorg-drv-video-nvidia xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx libnvidia-tls.so.1 = xorg-drv-video-nvidia xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx
xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-nouveau xorg-drv-video-vboxvideo xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-nouveau xorg-drv-video-vboxvideo
xorgdrvinput = xorg-drv-input-mouse xorg-drv-input-keyboard xorg-drv-input-joystick xorg-drv-input-void xorg-drv-input-synaptics xorg-drv-input-vboxmouse xorg-drv-input-evtouch xorgdrvinput = xorg-drv-input-mouse xorg-drv-input-keyboard xorg-drv-input-joystick xorg-drv-input-void xorg-drv-input-synaptics xorg-drv-input-vboxmouse xorg-drv-input-evtouch xorg-drv-input-evdev
libGL.so.1 = libGL-Mesa-dri libGL.so.1 = libGL-Mesa-dri
libGLU.so.1 = libGL-Mesa-dri libGLU.so.1 = libGL-Mesa-dri
@ -96,6 +96,9 @@ perl[Automake__XFile] = automake
# openoffice # openoffice
openofficei18n = OpenOffice-i18n-$(LANGUAGE) openofficei18n = OpenOffice-i18n-$(LANGUAGE)
# vpn
networkmanagervpnplugin = NetworkManager-vpnc NetworkManager-pptp
ifdef PLATFORM ifdef PLATFORM
include $(TARGETSDIR)/$(TARGET)/platforms/$(PLATFORM)/Makefile.defs include $(TARGETSDIR)/$(TARGET)/platforms/$(PLATFORM)/Makefile.defs
endif endif

21
platforms/livecd/root/boot/isolinux/help.txt
View File

@ -2,20 +2,19 @@
openmamba CD boot menu openmamba CD boot menu
====================== ======================
1) System startup at 800x600 resolution (default choice) kms) Autodetect startup video mode (default choice)
2) System startup at 1024x768 resolution vga1024) Force system startup at 1024x768 resolution
3) System startup at 1280x1024 resolution vga800) Force system startup at 1280x1024 resolution
1-freevideo,2-freevideo,3-freevideo) like 1,2,3 + Open Source video drivers
8) System startup in debug mode debug) System startup in debug mode
9) Start a system memory benchmark memtest) Start a system memory benchmark
Please, enter 1 or wait 10 seconds to boot automatically. Please, enter your choice or wait 10 seconds to boot automatically.
You can also pass some extra parameters to the kernel. For example: You can also pass some extra parameters to the kernel. For example:
boot: 1 debug=1 video=uvesafb:off postplug=nosound,freevideo boot: kms debug=1 splash=off postplug=nosound,freevideo
If you have trouble booting the system please use the choice '8' or the If you have trouble booting the system please use the choice 'debug' or the
debug=1 and vga=normal options in order to see system messages. debug=1 and splash=off options in order to see system messages.
NOTE: In most cases you just need to hit ENTER to boot with default settings. NOTE: In most cases you just need to hit ENTER to boot with default settings.