[Debian-live-changes] r2402 - in configs/webc/webconverger/config: . chroot_local-packageslists chroot_sources templates/syslinux
kai-guest at alioth.debian.org
kai-guest at alioth.debian.org
Thu Jul 5 06:58:08 UTC 2007
Author: kai-guest
Date: 2007-07-05 06:58:08 +0000 (Thu, 05 Jul 2007)
New Revision: 2402
Added:
configs/webc/webconverger/config/templates/syslinux/f2.txt
configs/webc/webconverger/config/templates/syslinux/f5.txt
configs/webc/webconverger/config/templates/syslinux/f6.txt
configs/webc/webconverger/config/templates/syslinux/f7.txt
configs/webc/webconverger/config/templates/syslinux/f8.txt
Modified:
configs/webc/webconverger/config/binary
configs/webc/webconverger/config/chroot_local-packageslists/webconverger
configs/webc/webconverger/config/chroot_sources/backports.bootstrap
configs/webc/webconverger/config/source
configs/webc/webconverger/config/templates/syslinux/boot.txt
configs/webc/webconverger/config/templates/syslinux/f1.txt
configs/webc/webconverger/config/templates/syslinux/f10.txt
configs/webc/webconverger/config/templates/syslinux/f3.txt
configs/webc/webconverger/config/templates/syslinux/f4.txt
configs/webc/webconverger/config/templates/syslinux/f9.txt
configs/webc/webconverger/config/templates/syslinux/isolinux.cfg
configs/webc/webconverger/config/templates/syslinux/pxelinux.cfg
configs/webc/webconverger/config/templates/syslinux/splash.rle
Log:
template from d-l trunk
Modified: configs/webc/webconverger/config/binary
===================================================================
--- configs/webc/webconverger/config/binary 2007-07-04 22:42:15 UTC (rev 2401)
+++ configs/webc/webconverger/config/binary 2007-07-05 06:58:08 UTC (rev 2402)
@@ -1,7 +1,7 @@
# config/chroot: configuration for lh_image_*
# Uncomment for final version
-LIVE_BOOTAPPEND="quiet splash vga=773"
+LIVE_BOOTAPPEND="quiet splash vga=773 upgrade"
# $LIVE_ENCRYPTION: set encrytion
# (Default: empty)
@@ -39,7 +39,7 @@
# $LIVE_BINARY_IMAGE: set image type
# (Default: iso)
-#LIVE_BINARY_IMAGES="usb-hdd"
+LIVE_BINARY_IMAGES="usb-hdd"
# $LIVE_TEMPLATES: set templates
# (Default: /usr/share/live-helper/templates)
Modified: configs/webc/webconverger/config/chroot_local-packageslists/webconverger
===================================================================
--- configs/webc/webconverger/config/chroot_local-packageslists/webconverger 2007-07-04 22:42:15 UTC (rev 2401)
+++ configs/webc/webconverger/config/chroot_local-packageslists/webconverger 2007-07-05 06:58:08 UTC (rev 2402)
@@ -5,13 +5,17 @@
# Standard
console-common kbd locales
+#debugging
+openssh-client
+
# X11
xorg xresprobe discover menu
alsa-base alsa-oss alsa-utils
# For upgrade, firewall et al. features
-live-sysvinit
+live-initscripts
+usplash
usplash-theme-webconverger
webconverger-base
webconverger-archive-keyring
@@ -48,4 +52,4 @@
xpdf mozplugger
########## non-free software
-flashplugin-nonfree
+flashplugin-nonfree
Modified: configs/webc/webconverger/config/chroot_sources/backports.bootstrap
===================================================================
--- configs/webc/webconverger/config/chroot_sources/backports.bootstrap 2007-07-04 22:42:15 UTC (rev 2401)
+++ configs/webc/webconverger/config/chroot_sources/backports.bootstrap 2007-07-05 06:58:08 UTC (rev 2402)
@@ -1,6 +1,6 @@
# Debian Live Etch backports
-deb http://live.debian.net/debian etch main
-deb-src http://live.debian.net/debian etch main
+#deb http://live.debian.net/debian etch main
+#deb-src http://live.debian.net/debian etch main
# bleeding edge live-initramfs
-#deb http://live.debian.net/debian-snapshots/ ./
+deb http://live.debian.net/debian-snapshots/ ./
Modified: configs/webc/webconverger/config/source
===================================================================
--- configs/webc/webconverger/config/source 2007-07-04 22:42:15 UTC (rev 2401)
+++ configs/webc/webconverger/config/source 2007-07-05 06:58:08 UTC (rev 2402)
@@ -1,3 +1,3 @@
# $LIVE_SOURCE: set source option
# (Default: )
-LIVE_SOURCE="enabled"
+#LIVE_SOURCE="enabled"
Modified: configs/webc/webconverger/config/templates/syslinux/boot.txt
===================================================================
--- configs/webc/webconverger/config/templates/syslinux/boot.txt 2007-07-04 22:42:15 UTC (rev 2401)
+++ configs/webc/webconverger/config/templates/syslinux/boot.txt 2007-07-05 06:58:08 UTC (rev 2402)
@@ -1,3 +1,2 @@
-splash.rle
-Press F1control and F then 1 for help, or ENTER to
\ No newline at end of file
+Press F1control and F then 1 for help, or ENTER to
Modified: configs/webc/webconverger/config/templates/syslinux/f1.txt
===================================================================
--- configs/webc/webconverger/config/templates/syslinux/f1.txt 2007-07-04 22:42:15 UTC (rev 2401)
+++ configs/webc/webconverger/config/templates/syslinux/f1.txt 2007-07-05 06:58:08 UTC (rev 2402)
@@ -1,24 +1,25 @@
- 0fWelcome to Webconverger07 09F107
+ 0fWelcome to Debian GNU/Linux!07 09F107
-This is Webconverger, built on LIVE_DATE.
+This is a Debian Live CD-ROM.
+It was built on LIVE_DATE.
0fHELP INDEX07
0fKEY TOPIC07
<09F107> This page, the help index.
+<09F207> Prerequisites for installing Debian.
<09F307> Boot methods for special ways of using this CD-ROM
-<09F407> Special boot parameters, overview.
-<09F907> About Webcoverger.
+<09F407> Additional boot methods; live and rescue modes.
+<09F507> Special boot parameters, overview.
+<09F607> Special boot parameters for special machines.
+<09F707> Special boot parameters for selected disk controllers.
+<09F807> Special boot parameters for the install system.
+<09F907> How to get help.
<09F1007> Copyrights and warranties.
For F1-F9 type control and F then the digit 1-9
For F10 type control and F then the digit 0
-
-
-
-
-
Press F2 through F10 for details, or ENTER to
Modified: configs/webc/webconverger/config/templates/syslinux/f10.txt
===================================================================
--- configs/webc/webconverger/config/templates/syslinux/f10.txt 2007-07-04 22:42:15 UTC (rev 2401)
+++ configs/webc/webconverger/config/templates/syslinux/f10.txt 2007-07-05 06:58:08 UTC (rev 2402)
@@ -1,10 +1,6 @@
0fCOPYRIGHTS AND WARRANTIES07 09F1007
-Webconverger.com (C) 2007
-
-Daisy splash image from http://flickr.com/photos/dgodin/265054078/
-
-Debian GNU/Linux is Copyright (C) 1993-2006 Software in the Public Interest,
+Debian GNU/Linux is Copyright (C) 1993-2007 Software in the Public Interest,
and others.
The Debian GNU/Linux system is freely redistributable. After installation,
@@ -16,6 +12,12 @@
---
-Webconverger was built with live-helper, version LIVE_VERSION.
+This Debian Live system was built with live-helper, version LIVE_VERSION.
+More information about the Debian Live project can be found at
+<http://debian-live.alioth.debian.org/>.
+
+
+
+
Press F1control and F then 1 for the help index, or ENTER to
Added: configs/webc/webconverger/config/templates/syslinux/f2.txt
===================================================================
--- configs/webc/webconverger/config/templates/syslinux/f2.txt (rev 0)
+++ configs/webc/webconverger/config/templates/syslinux/f2.txt 2007-07-05 06:58:08 UTC (rev 2402)
@@ -0,0 +1,23 @@
+ 0fPREREQUISITES FOR INSTALLING DEBIAN07 09F207
+
+You must have at least 32 megabytes of RAM to use this Debian installer.
+
+You should have space on your hard disk to create a new disk partition
+of at least 256 megabytes to install the base system. You'll need more
+disk space to install additional packages, depending on what you wish
+to do with your new Debian system.
+
+See the Installation Manual or the FAQ for more information; both
+documents are available at the Debian web site, 0fhttp://www.debian.org/07
+
+Thank you for choosing Debian!
+
+
+
+
+
+
+
+
+
+Press F1control and F then 1 for the help index, or ENTER to
\ No newline at end of file
Modified: configs/webc/webconverger/config/templates/syslinux/f3.txt
===================================================================
--- configs/webc/webconverger/config/templates/syslinux/f3.txt 2007-07-04 22:42:15 UTC (rev 2401)
+++ configs/webc/webconverger/config/templates/syslinux/f3.txt 2007-07-05 06:58:08 UTC (rev 2402)
@@ -1,23 +1,23 @@
0fBOOT METHODS07 09F307
+
0fAvailable boot methods:07
-0flive07
- Start the live system -- this is the default CD-ROM mode.
-0fmemtest07
- Start the memtest86+ RAM tester.
+0finstall07
+ Start the installation.
+0finstallgui07
+ Start the installation using the graphical installer.
+0fexpert07
+ Start the installation in expert mode, for maximum control.
+0fexpertgui07
+ Start the installation in expert mode using the graphical installer.
To use one of these boot methods, type it at the prompt, optionally
followed by any boot parameters. For example:
- boot: live foo=bar
+ boot: install acpi=off
If unsure, you should use the default boot method, with no special
parameters, by simply pressing enter at the boot prompt.
-
-
-
-
-
Press F1control and F then 1 for the help index, or ENTER to
Modified: configs/webc/webconverger/config/templates/syslinux/f4.txt
===================================================================
--- configs/webc/webconverger/config/templates/syslinux/f4.txt 2007-07-04 22:42:15 UTC (rev 2401)
+++ configs/webc/webconverger/config/templates/syslinux/f4.txt 2007-07-05 06:58:08 UTC (rev 2402)
@@ -1,20 +1,23 @@
- 0fSPECIAL BOOT PARAMETERS - VARIOUS HARDWARE07 09F407
+ 0fLIVE AND RESCUE MODES07 09F407
-You can use the following boot parameters at the 0fboot:07 prompt,
-in combination with the boot method (see <09F307>).
-0f
-OPTION PARAMETER TO SPECIFY07
-Set a static ip (no dhcp) 0fip=if,add,netm,gatew07
-Set the homepage 0fhomepage=<url>07
-Copy the live media to memory 0ftoram07
-For example to reuse the media across different machines:
+0fUse one of these boot methods to start the live system07
- boot: live toram homepage=http//webconverger.com
+0flive07
+ Start the live system in standard mode -- this is the default.
+0flive-failsafe07
+ Start the live system in failsafe mode.
-Then one can remove the media (CDROM for e.g.) to boot other machines with
-Webconverger.
-Better documentation for more options can be found at:
-http://webconverger.infogami.com/Features
+0fUse one of these boot methods to rescue an existing install07
+0frescue07
+ Boot into rescue mode.
+0frescuegui07
+ Boot into rescue mode using the graphical installer.
+
+0fmemtest07
+ Run memtest86+ (memory tester).
+0ffloppy07, 0fdisk107 or 0fdisk207
+ Boot from the floppy, first or second hard disk.
+
Press F1control and F then 1 for the help index, or ENTER to
Added: configs/webc/webconverger/config/templates/syslinux/f5.txt
===================================================================
--- configs/webc/webconverger/config/templates/syslinux/f5.txt (rev 0)
+++ configs/webc/webconverger/config/templates/syslinux/f5.txt 2007-07-05 06:58:08 UTC (rev 2402)
@@ -0,0 +1,23 @@
+ 0fSPECIAL BOOT PARAMETERS - OVERVIEW07 09F507
+
+On a few systems, you may need to specify a parameter at the 0fboot:07
+prompt in order to boot the system. For example, Linux may not be able
+to autodetect your hardware, and you may need to explicitly specify
+its location or type for it to be recognized.
+
+For more information about what boot parameters you can use, press:
+
+ <09F607> -- boot parameters for special machines
+ <09F707> -- boot parameters for various disk controllers
+ <09F807> -- boot parameters understood by the install system
+
+Note that to specify a parameter for a particular kernel module, use the form
+module.param=value, for example: libata.atapi_enabled=1
+
+
+
+
+
+
+
+Press F1control and F then 1 for the help index, or ENTER to
\ No newline at end of file
Added: configs/webc/webconverger/config/templates/syslinux/f6.txt
===================================================================
--- configs/webc/webconverger/config/templates/syslinux/f6.txt (rev 0)
+++ configs/webc/webconverger/config/templates/syslinux/f6.txt 2007-07-05 06:58:08 UTC (rev 2402)
@@ -0,0 +1,23 @@
+ 0fSPECIAL BOOT PARAMETERS - VARIOUS HARDWARE07 09F607
+
+You can use the following boot parameters at the 0fboot:07 prompt,
+in combination with the boot method (see <09F307>).
+If you use hex numbers you have to use the 0x prefix (e.g., 0x300).
+0f
+HARDWARE PARAMETER TO SPECIFY07
+IBM PS/1 or ValuePoint (IDE disk) 0fhd=0bcylinders0f,0bheads0f,0bsectors07
+Some IBM ThinkPads 0ffloppy.floppy=thinkpad07
+IBM Pentium Microchannel 0fmca-pentium no-hlt07
+Protect I/O port regions 0freserve=0biobase0f,0bextent07[0f,0b...07]
+Workaround faulty FPU (old machines) 0fno38707
+Laptops with screen display problems 0fvga=77107
+Use first serial port at 9600 baud 0fconsole=ttyS0,9600n807
+Force use of generic IDE driver 0fgeneric.all_generic_ide=107
+
+If you experience lockups or other hardware failures,
+disable buggy APIC interrupt routing 0fnoapic nolapic07
+
+For example:
+ boot: install vga=771 noapic nolapic
+
+Press F1control and F then 1 for the help index, or ENTER to
\ No newline at end of file
Added: configs/webc/webconverger/config/templates/syslinux/f7.txt
===================================================================
--- configs/webc/webconverger/config/templates/syslinux/f7.txt (rev 0)
+++ configs/webc/webconverger/config/templates/syslinux/f7.txt 2007-07-05 06:58:08 UTC (rev 2402)
@@ -0,0 +1,23 @@
+ 0fSPECIAL BOOT PARAMETERS - VARIOUS DISK DRIVES07 09F707
+
+You can use the following boot parameters at the 0fboot:07 prompt,
+in combination with the boot method (see <09F307>).
+0f
+HARDWARE PARAMETER TO SPECIFY07
+Adaptec 151x, 152x 0faha152x.aha152x=0biobase07[0f,0birq07[0f,0bscsi-id07[0f,0breconnect07]]]
+Adaptec 1542 0faha1542.aha1542=0biobase07[0f,0bbuson0f,0bbusoff07[0f,0bdmaspeed07]]
+Adaptec 274x, 284x 0faic7xxx.aic7xxx=no_reset07 (enabled if non-zero)
+BusLogic SCSI Hosts 0fBusLogic.BusLogic=0biobase07
+Certain DELL machines 0faic7xxx.aic7xxx=no_probe07
+
+This list is incomplete, see the kernel's kernel-parameters.txt file
+for more.
+
+
+
+
+For example:
+
+ boot: install aic7xxx.aic7xxx=no_probe
+
+Press F1control and F then 1 for the help index, or ENTER to
\ No newline at end of file
Added: configs/webc/webconverger/config/templates/syslinux/f8.txt
===================================================================
--- configs/webc/webconverger/config/templates/syslinux/f8.txt (rev 0)
+++ configs/webc/webconverger/config/templates/syslinux/f8.txt 2007-07-05 06:58:08 UTC (rev 2402)
@@ -0,0 +1,23 @@
+ 0fSPECIAL BOOT PARAMETERS - INSTALLATION SYSTEM07 09F807
+
+You can use the following boot parameters at the 0fboot:07 prompt,
+in combination with the boot method (see <09F307>). These parameters
+control how the installer works.
+0f
+RESULT PARAMETER07
+Verbose debugging 0fDEBCONF_DEBUG=507
+Debug boot sequence 0fBOOT_DEBUG=2|307
+Disable framebuffer 0ffb=false07
+Don't probe for USB 0fdebian-installer/probe/usb=false07
+Don't start PCMCIA 0fhw-detect/start_pcmcia=false07
+Force static network config 0fnetcfg/disable_dhcp=true07
+Set keyboard map 0fbootkbd=es07
+Use Braille tty 0fbrltty=driver,device,texttable07
+Use high contrast accessibility theme 0ftheme=dark07
+Use special tasks 0ftasks="kde-desktop, standard"07
+
+For example:
+
+ boot: install fb=false
+
+Press F1control and F then 1 for the help index, or ENTER to
\ No newline at end of file
Modified: configs/webc/webconverger/config/templates/syslinux/f9.txt
===================================================================
--- configs/webc/webconverger/config/templates/syslinux/f9.txt 2007-07-04 22:42:15 UTC (rev 2401)
+++ configs/webc/webconverger/config/templates/syslinux/f9.txt 2007-07-05 06:58:08 UTC (rev 2402)
@@ -1,9 +1,15 @@
- 0fABOUT WEBCONVERGER 07 09F907
+ 0fGETTING HELP07 09F907
-Please visit:
-0fhttp://webconverger.com/about07
+If you can't install Debian, don't despair! The Debian team is ready to
+help you! We are especially interested in hearing about installation
+problems, because in general they don't happen to only 0fone07 person.
+We've either already heard about your particular problem and can dispense a
+quick fix, or we would like to hear about it and work through it with you,
+and the next user who comes up with the same problem will profit from your
+experience!
-For copyright information, press <09F1007>.
+See the Installation Manual or the FAQ for more information; both
+documents are available at the Debian web site, 0fhttp://www.debian.org/07
@@ -14,7 +20,4 @@
-
-
-
-Press F1control and F then 1 for the help index, or ENTER to
+Press F1control and F then 1 for the help index, or ENTER to
\ No newline at end of file
Modified: configs/webc/webconverger/config/templates/syslinux/isolinux.cfg
===================================================================
--- configs/webc/webconverger/config/templates/syslinux/isolinux.cfg 2007-07-04 22:42:15 UTC (rev 2401)
+++ configs/webc/webconverger/config/templates/syslinux/isolinux.cfg 2007-07-05 06:58:08 UTC (rev 2402)
@@ -14,11 +14,11 @@
DEFAULT live
-LIVE_LINUX_LIVE
+LINUX_LIVE
-LIVE_LINUX_INSTALL
+LINUX_INSTALL
-LIVE_MEMTEST
+MEMTEST
#LABEL floppy
# localboot 0x00
@@ -33,4 +33,4 @@
# localboot -1
PROMPT 1
-TIMEOUT 20
+TIMEOUT 10
Modified: configs/webc/webconverger/config/templates/syslinux/pxelinux.cfg
===================================================================
--- configs/webc/webconverger/config/templates/syslinux/pxelinux.cfg 2007-07-04 22:42:15 UTC (rev 2401)
+++ configs/webc/webconverger/config/templates/syslinux/pxelinux.cfg 2007-07-05 06:58:08 UTC (rev 2402)
@@ -1,23 +1,23 @@
default live
label live
kernel vmlinuz
- append initrd=initrd.img boot=casper netboot nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
+ append initrd=initrd.img boot=casper netboot nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
label nfs
kernel vmlinuz
- append initrd=initrd.img boot=casper netboot=nfs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
+ append initrd=initrd.img boot=casper netboot=nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
label nfslegacy
kernel vmlinuz
- append initrd=initrd.img boot=casper root=/dev/nfs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
+ append initrd=initrd.img boot=casper root=/dev/nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
label cifs
kernel vmlinuz
- append initrd=initrd.img boot=casper netboot=cifs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
+ append initrd=initrd.img boot=casper netboot=cifs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
label cifslegacy
kernel vmlinuz
- append initrd=initrd.img boot=casper root=/dev/cifs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
+ append initrd=initrd.img boot=casper root=/dev/cifs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
label memtest
kernel memtest
display pxelinux.cfg/isolinux.txt
-timeout 0
+timeout 5
prompt 1
F1 pxelinux.cfg/f1.txt
F3 pxelinux.cfg/f3.txt
Modified: configs/webc/webconverger/config/templates/syslinux/splash.rle
===================================================================
(Binary files differ)
More information about the Debian-live-changes
mailing list