[Debian-live-changes] r2594 - in dists/trunk/live-helper: debian docs examples/hooks manpages
daniel at alioth.debian.org
daniel at alioth.debian.org
Fri Jul 27 08:05:46 UTC 2007
Author: daniel
Date: 2007-07-27 08:05:46 +0000 (Fri, 27 Jul 2007)
New Revision: 2594
Removed:
dists/trunk/live-helper/manpages/make-live.de.1
dists/trunk/live-helper/manpages/make-live.en.1
Modified:
dists/trunk/live-helper/debian/control
dists/trunk/live-helper/docs/ChangeLog
dists/trunk/live-helper/examples/hooks/ipw2100.sh
dists/trunk/live-helper/examples/hooks/ipw2200.sh
dists/trunk/live-helper/examples/hooks/ipw3945.sh
dists/trunk/live-helper/examples/hooks/madwifi.sh
dists/trunk/live-helper/examples/hooks/nvidia-legacy.sh
dists/trunk/live-helper/examples/hooks/rt2570.sh
dists/trunk/live-helper/examples/hooks/rt2x00.sh
dists/trunk/live-helper/examples/hooks/sun-java5.sh
dists/trunk/live-helper/examples/hooks/sun-java6.sh
Log:
Modified: dists/trunk/live-helper/debian/control
===================================================================
--- dists/trunk/live-helper/debian/control 2007-07-27 07:49:26 UTC (rev 2593)
+++ dists/trunk/live-helper/debian/control 2007-07-27 08:05:46 UTC (rev 2594)
@@ -19,7 +19,6 @@
to automate building of a Live system.
.
A typical program that uses live-helper will call several live-helper commands
- in sequence. Live-helper commands are all named with a "lh_" prefix. Examples
- of such a program that uses live-helper is make-live (included here).
+ in sequence. Live-helper commands are all named with a "lh_" prefix.
.
Homepage: <http://debian-live.alioth.debian.org/>
Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog 2007-07-27 07:49:26 UTC (rev 2593)
+++ dists/trunk/live-helper/docs/ChangeLog 2007-07-27 08:05:46 UTC (rev 2594)
@@ -2,6 +2,8 @@
* Makefile, debian/postinst, prerm:
- Added alternatives handling for includes and templates.
+ * examples/hooks/*:
+ - Cleaned up.
2007-07-19 Daniel Baumann <daniel at debian.org>
Modified: dists/trunk/live-helper/examples/hooks/ipw2100.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/ipw2100.sh 2007-07-27 07:49:26 UTC (rev 2593)
+++ dists/trunk/live-helper/examples/hooks/ipw2100.sh 2007-07-27 08:05:46 UTC (rev 2594)
@@ -2,15 +2,10 @@
# This is a hook for live-helper(7) to install ipw2100 drivers
# To enable it, copy this hook into your config/chroot_local-hooks directory.
-
-# IMPORTANT: for apt-get to locate the required packages you need to
-# add "contrib" sections and the 686 flavour.
#
-# e.g with make-live : --sections "main contrib" --kernel-flavour 686
+# Note: This hook requires packages from the contrib section. Make sure you enabled
+# it in your configuration.
-# Updating indices
-apt-get update
-
# Building kernel module
which module-assistant || apt-get install --yes module-assistant
module-assistant update
@@ -18,7 +13,6 @@
module-assistant clean ipw2100
# Installing firmware (http://ipw2100.sourceforge.net/firmware.php)
-# grabbing 0.55 (Wed May 16 15:17:38 -- matth)
wget --referer "http://ipw2100.sourceforge.net/firmware.php" "http://ipw2100.sourceforge.net/firmware.php?i_agree_to_the_license=yes&f=ipw2100-fw-1.3.tgz" -O /tmp/ipw2100-fw-1.3.tgz
cd /tmp
Modified: dists/trunk/live-helper/examples/hooks/ipw2200.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/ipw2200.sh 2007-07-27 07:49:26 UTC (rev 2593)
+++ dists/trunk/live-helper/examples/hooks/ipw2200.sh 2007-07-27 08:05:46 UTC (rev 2594)
@@ -2,15 +2,10 @@
# This is a hook for live-helper(7) to install nvidia-legacy drivers
# To enable it, copy this hook into your config/chroot_local-hooks directory.
-
-# IMPORTANT: for apt-get to locate the required packages you need to
-# add "contrib" sections and the 686 flavour.
#
-# e.g with make-live : --sections "main contrib" --kernel-flavour 686
+# Note: This hook requires packages from the contrib section. Make sure you enabled
+# it in your configuration.
-# Updating indices
-apt-get update
-
# Building kernel mdoule
which module-assistant || apt-get install --yes module-assistant
module-assistant update
@@ -18,7 +13,6 @@
module-assistant clean ipw2200
# Installing firmware (http://ipw2200.sourceforge.net/firmware.php)
-# grabbing 3.0 (Wed May 16 15:17:38 -- matth)
wget --referer "http://ipw2200.sourceforge.net/firmware.php" "http://ipw2200.sourceforge.net/firmware.php?i_agree_to_the_license=yes&f=ipw2200-fw-3.0.tgz" -O /tmp/ipw2200-fw-3.0.tgz
cd /tmp
Modified: dists/trunk/live-helper/examples/hooks/ipw3945.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/ipw3945.sh 2007-07-27 07:49:26 UTC (rev 2593)
+++ dists/trunk/live-helper/examples/hooks/ipw3945.sh 2007-07-27 08:05:46 UTC (rev 2594)
@@ -2,19 +2,16 @@
# This is a hook for live-helper(7) to install ipw3945 drivers
# To enable it, copy this hook into your config/chroot_local-hooks directory.
-
-# IMPORTANT: for apt-get to locate the required packages you need to
-# add "non-free" sections
#
-# e.g with make-live : --sections "main non-free"
+# Note: This hook requires packages from the contrib and non-free section. Make
+# sure you enabled it in your configuration.
+#
+# FIXME: it runs in interactive mode
-# Updating indices
-apt-get update
-
# Building kernel module
which module-assistant || apt-get install --yes module-assistant
module-assistant update
-module-assistant auto-install ipw3945 # interactive mode for now
+module-assistant auto-install ipw3945
module-assistant clean ipw3945
apt-get install ipw3945d firmware-ipw3945
Modified: dists/trunk/live-helper/examples/hooks/madwifi.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/madwifi.sh 2007-07-27 07:49:26 UTC (rev 2593)
+++ dists/trunk/live-helper/examples/hooks/madwifi.sh 2007-07-27 08:05:46 UTC (rev 2594)
@@ -2,14 +2,12 @@
# This is a hook for live-helper(7) to install madwifi drivers
# To enable it, copy this hook into your config/chroot_localhooks directory.
-
-# IMPORTANT: for apt-get to locate the required packages you need to
-# add "non-free" sections
#
-# e.g with make-live : --sections "main non-free"
+# Note: This hook requires packages from the contrib section. Make sure you enabled
+# it in your configuration.
+#
+# FIXME: it runs in interactive mode
-# NOTE: it runs in interactive mode
-
# Updating indices
apt-get update
Modified: dists/trunk/live-helper/examples/hooks/nvidia-legacy.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/nvidia-legacy.sh 2007-07-27 07:49:26 UTC (rev 2593)
+++ dists/trunk/live-helper/examples/hooks/nvidia-legacy.sh 2007-07-27 08:05:46 UTC (rev 2594)
@@ -2,15 +2,10 @@
# This is a hook for live-helper(7) to install nvidia-legacy drivers
# To enable it, copy this hook into your config/chroot_localhooks directory.
-
-# IMPORTANT: for apt-get to locate the required packages you need to
-# add "contrib non-free" sections.
#
-# e.g with make-live : --sections "main contrib non-free"
+# Note: This hook requires packages from the non-free section. Make sure you
+# enabled it in your configuration.
-# Updating indices
-apt-get update
-
# Building kernel module
which module-assistant || apt-get install --yes module-assistant nvidia-kernel-common
module-assistant update
Modified: dists/trunk/live-helper/examples/hooks/rt2570.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/rt2570.sh 2007-07-27 07:49:26 UTC (rev 2593)
+++ dists/trunk/live-helper/examples/hooks/rt2570.sh 2007-07-27 08:05:46 UTC (rev 2594)
@@ -2,13 +2,9 @@
# This is a hook for live-helper(7) to install ralink rt2570 drivers
# To enable it, copy this hook into your config/chroot_local-hooks directory.
+#
+# FIXME: it runs in interactive mode
-# NOTE: it runs in interactive mode
-
-# Updating indices
-apt-get update
-
-# Building kernel module
which module-assistant || apt-get install --yes module-assistant
module-assistant update
module-assistant auto-install rt2570-source
Modified: dists/trunk/live-helper/examples/hooks/rt2x00.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/rt2x00.sh 2007-07-27 07:49:26 UTC (rev 2593)
+++ dists/trunk/live-helper/examples/hooks/rt2x00.sh 2007-07-27 08:05:46 UTC (rev 2594)
@@ -2,12 +2,9 @@
# This is a hook for live-helper(7) to install ralink rt2x00 drivers
# To enable it, copy this hook into your config/chroot_local-hooks directory.
+#
+# FIXME: it runs in interactive mode
-# NOTE: it runs in interactive mode
-
-# Updating indices
-apt-get update
-
# Building kernel modules
which module-assistant || apt-get install --yes module-assistant
module-assistant update
Modified: dists/trunk/live-helper/examples/hooks/sun-java5.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/sun-java5.sh 2007-07-27 07:49:26 UTC (rev 2593)
+++ dists/trunk/live-helper/examples/hooks/sun-java5.sh 2007-07-27 08:05:46 UTC (rev 2594)
@@ -1,10 +1,11 @@
#!/bin/sh
# This is a hook for live-helper(7) to install sun-java.
+# To enable it, copy this hook into your config/chroot_local-hooks directory.
#
-# To enable it, copy this hook into your config/chroot_local-hooks directory and
-# don't forget to enable non-free in LIVE_SECTIONS.
-#
+# Note: This hook requires packages from the non-free section. Make sure you
+# enabled it in your configuration.
+
# live-helper sets DEBIAN_FRONTEND to 'noninteractive' to advise debconf to not
# ask any questions while installing packages. Suns redistribution terms for
# Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for
Modified: dists/trunk/live-helper/examples/hooks/sun-java6.sh
===================================================================
--- dists/trunk/live-helper/examples/hooks/sun-java6.sh 2007-07-27 07:49:26 UTC (rev 2593)
+++ dists/trunk/live-helper/examples/hooks/sun-java6.sh 2007-07-27 08:05:46 UTC (rev 2594)
@@ -1,10 +1,11 @@
#!/bin/sh
# This is a hook for live-helper(7) to install sun-java.
+# To enable it, copy this hook into your config/chroot_local-hooks directory.
#
-# To enable it, copy this hook into your config/chroot_local-hooks directory and
-# don't forget to enable non-free in LIVE_SECTIONS.
-#
+# Note: This hook requires packages from the non-free section. Make sure you
+# enabled it in your configuration.
+
# live-helper sets DEBIAN_FRONTEND to 'noninteractive' to advise debconf to not
# ask any questions while installing packages. Suns redistribution terms for
# Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for
Deleted: dists/trunk/live-helper/manpages/make-live.de.1
===================================================================
--- dists/trunk/live-helper/manpages/make-live.de.1 2007-07-27 07:49:26 UTC (rev 2593)
+++ dists/trunk/live-helper/manpages/make-live.de.1 2007-07-27 08:05:46 UTC (rev 2594)
@@ -1,88 +0,0 @@
-.TH MAKE\-LIVE 1 "23.07.2007" "1.0~a20" "live\-helper"
-
-.SH NAME
-make\-live \- erstellt ein Debian Live-System
-
-.SH SYNOPSIS
-.B make\-live
-[config]
-[\-\-mode \fIMODE\fR]
-[\-\-config \fICONFIG\fR]
-[\-\-apt \fIapt\fR|\fIaptitude\fR]
-[\-\-apt\-ftpproxy \fIURL\fR]
-[\-\-apt\-httpproxy \fIURL\fR]
-[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR]
-[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR]
-[\-\-apt\-recommends \fIenabled\fR|\fIdisabled]
-[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR]
-[\-\-cache \fIenabled\fR|\fIdisabled\fR]
-[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR]
-[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR]
-[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR]
-[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR]
-[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR]
-[\-\-tasksel \fIaptitude\fR|\fItasksel\fR]
-[\-r|\-\-root \fIDIRECTORY\fR]
-[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR]
-[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR]
-[\-\-distribution\-config \fIDIRECTORY\fR]
-[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR]
-[\-m|\-\-mirror\-build \fIURL\fR]
-[\-\-mirror\-build\-security \fIURL\fR]
-[\-\-mirror\-image \fIURL\fR]
-[\-\-mirror\-image\-security \fIURL\fR]
-[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR]
-[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR]
-[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR]
-[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR]
-[\-l|\-\-language \fILANGUAGE\fR]
-[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR]
-[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR]
-[\-\-security \fIenabled\fR|\fIdisabled\fR]
-[\-\-symlinks \fIenabled\fR|\fIdisabled\fR]
-[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR]
-[\-e|\-\-encryption \fIALGORITHM\fR]
-[\-\-username \fINAME\fR]
-[\-\-hostname \fINAME\fR]
-[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR]
-[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR]
-[\-\-iso\-volume \fISTRING\fR]
-[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR]
-[\-\-server\-path \fIDIRECTORY\fR]
-[\-\-source \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR]
-[\-\-grub\-splash \fIFILE\fR]
-[\-\-syslinux\-splash \fIFILE\fR]
-[\-b|\-\-binary\-image \fIiso\fR|\fInet\fR|\fItar\fR|\fInet\fR]
-[\-s|\-\-source\-image \fIiso\fR|\fInet\fR|\fItar\fR|\fInet\fR]
-[\-\-includes \fIPATH\fR]
-[\-\-templates \fIPATH\fR]
-[\-\-breakpoints]
-[\-\-debug]
-[\-\-force]
-[\-\-quiet]
-[\-\-verbose]
-
-.SH BESCHREIBUNG
-make\-live is ein Script das alle n\[:o]tigen live\-helper Programme aufruft um ein Live-System zu erstellen.
-
-.SH OPTIONEN
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.
Deleted: dists/trunk/live-helper/manpages/make-live.en.1
===================================================================
--- dists/trunk/live-helper/manpages/make-live.en.1 2007-07-27 07:49:26 UTC (rev 2593)
+++ dists/trunk/live-helper/manpages/make-live.en.1 2007-07-27 08:05:46 UTC (rev 2594)
@@ -1,88 +0,0 @@
-.TH MAKE\-LIVE 1 "2007\-07\-23" "1.0~a20" "live\-helper"
-
-.SH NAME
-make\-live \- build a Debian Live system
-
-.SH SYNOPSIS
-.B make\-live
-[config]
-[\-\-mode \fIMODE\fR]
-[\-\-config \fICONFIG\fR]
-[\-\-apt \fIapt\fR|\fIaptitude\fR]
-[\-\-apt\-ftpproxy \fIURL\fR]
-[\-\-apt\-httpproxy \fIURL\fR]
-[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR]
-[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR]
-[\-\-apt\-recommends \fIenabled\fR|\fIdisabled]
-[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR]
-[\-\-cache \fIenabled\fR|\fIdisabled\fR]
-[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR]
-[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR]
-[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR]
-[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR]
-[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR]
-[\-\-tasksel \fIaptitude\fR|\fItasksel\fR]
-[\-r|\-\-root \fIDIRECTORY\fR]
-[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR]
-[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR]
-[\-\-distribution\-config \fIDIRECTORY\fR]
-[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR]
-[\-m|\-\-mirror\-build \fIURL\fR]
-[\-\-mirror\-build\-security \fIURL\fR]
-[\-\-mirror\-image \fIURL\fR]
-[\-\-mirror\-image\-security \fIURL\fR]
-[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR]
-[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR]
-[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR]
-[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR]
-[\-l|\-\-language \fILANGUAGE\fR]
-[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR]
-[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR]
-[\-\-security \fIenabled\fR|\fIdisabled\fR]
-[\-\-symlinks \fIenabled\fR|\fIdisabled\fR]
-[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR]
-[\-e|\-\-encryption \fIALGORITHM\fR]
-[\-\-username \fINAME\fR]
-[\-\-hostname \fINAME\fR]
-[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR]
-[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR]
-[\-\-iso\-volume \fISTRING\fR]
-[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR]
-[\-\-server\-path \fIDIRECTORY\fR]
-[\-\-source \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR]
-[\-\-grub\-splash \fIFILE\fR]
-[\-\-syslinux\-splash \fIFILE\fR]
-[\-b|\-\-binary\-image \fIiso\fR|\fInet\fR|\fItar\fR|\fInet\fR]
-[\-s|\-\-source\-image \fIiso\fR|\fInet\fR|\fItar\fR|\fInet\fR]
-[\-\-includes \fIPATH\fR]
-[\-\-templates \fIPATH\fR]
-[\-\-breakpoints]
-[\-\-debug]
-[\-\-force]
-[\-\-quiet]
-[\-\-verbose]
-
-.SH DESCRIPTION
-make\-live is a script calling all required live\-helper(7) programs to build a live system.
-
-.SH OPTIONS
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.
More information about the Debian-live-changes
mailing list