From 309a9da2fa5e491f8ab1503cabfd1f9c9aa949e2 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 22 Jul 2011 16:17:51 +0200 Subject: [PATCH] Sync some changes from openmamba (devel) branch --- Makefile.defs | 5 ++++- platforms/livecd/root/boot/isolinux/help.txt | 21 ++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 90d1221..e20dd2c 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -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 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 -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 libGLU.so.1 = libGL-Mesa-dri @@ -96,6 +96,9 @@ perl[Automake__XFile] = automake # openoffice openofficei18n = OpenOffice-i18n-$(LANGUAGE) +# vpn +networkmanagervpnplugin = NetworkManager-vpnc NetworkManager-pptp + ifdef PLATFORM include $(TARGETSDIR)/$(TARGET)/platforms/$(PLATFORM)/Makefile.defs endif diff --git a/platforms/livecd/root/boot/isolinux/help.txt b/platforms/livecd/root/boot/isolinux/help.txt index aaec0b5..94a01b6 100644 --- a/platforms/livecd/root/boot/isolinux/help.txt +++ b/platforms/livecd/root/boot/isolinux/help.txt @@ -2,20 +2,19 @@ openmamba CD boot menu ====================== - 1) System startup at 800x600 resolution (default choice) - 2) System startup at 1024x768 resolution - 3) 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 - 9) Start a system memory benchmark + kms) Autodetect startup video mode (default choice) + vga1024) Force system startup at 1024x768 resolution + vga800) Force system startup at 1280x1024 resolution + + debug) System startup in debug mode + 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: -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 -debug=1 and vga=normal options in order to see system messages. +If you have trouble booting the system please use the choice 'debug' or the +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. -