From fe7102be0cfa4b23ac583055dfdfc6241fd61179 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 23 Sep 2007 10:04:23 +0200 Subject: Adding live-package 0.99.9-1. --- ChangeLog | 9 +++ Makefile | 8 +- debian/changelog | 8 ++ doc/man/make-live.1 | 196 +++++++++++++++++++++++++++++++++++++++++++++ doc/man/make-live.8 | 196 --------------------------------------------- doc/man/make-live.conf.5 | 94 ++++++++++++++++++++++ doc/man/make-live.conf.8 | 94 ---------------------- src/config | 22 +++++ src/lists/minimal | 2 +- src/main.sh | 11 ++- src/scripts/11bootstrap.sh | 11 +++ src/scripts/14chroot.sh | 16 ++++ src/scripts/21image.sh | 20 +++++ 13 files changed, 390 insertions(+), 297 deletions(-) create mode 100644 doc/man/make-live.1 delete mode 100644 doc/man/make-live.8 create mode 100644 doc/man/make-live.conf.5 delete mode 100644 doc/man/make-live.conf.8 diff --git a/ChangeLog b/ChangeLog index c699f06..7825551 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-10-01 Daniel Baumann + + * Added multiple repositories. + * Using LIVE_PROXY_* also for bootstraping. + +2006-09-27 Daniel Baumann + + * Changing manpage section. + 2006-09-26 Daniel Baumann * Added default flavour hooks. diff --git a/Makefile b/Makefile index 29ebd20..b35adbc 100644 --- a/Makefile +++ b/Makefile @@ -30,8 +30,10 @@ install: install -m 0644 doc/*.txt $(DESTDIR)/usr/share/doc/live-package @# Install manpages - install -d -m 0755 $(DESTDIR)/usr/share/man/man8 - install -m 0644 doc/man/*.8 $(DESTDIR)/usr/share/man/man8 + install -d -m 0755 $(DESTDIR)/usr/share/man/man1 + install -m 0644 doc/man/*.1 $(DESTDIR)/usr/share/man/man1 + install -d -m 0755 $(DESTDIR)/usr/share/man/man5 + install -m 0644 doc/man/*.5 $(DESTDIR)/usr/share/man/man5 uninstall: # Uninstalling make-live @@ -48,6 +50,6 @@ uninstall: rm -rf $(DESTDIR)/usr/share/doc/live-package @# Remove manpages - rm -f $(DESTDIR)/usr/share/man/man8/make-live.* + rm -f $(DESTDIR)/usr/share/man/man1/make-live.* reinstall: uninstall install diff --git a/debian/changelog b/debian/changelog index b8814e1..831c7ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +live-package (0.99.9-1) unstable; urgency=medium + + * New upstream release: + - adds support for custom repositories (Closes: #387068). + - using proxy for chroot creating too (Closes: #390378). + + -- Daniel Baumann Mon, 2 Oct 2006 00:00:00 +0200 + live-package (0.99.8-1) unstable; urgency=medium * New upstream release. diff --git a/doc/man/make-live.1 b/doc/man/make-live.1 new file mode 100644 index 0000000..5ffb449 --- /dev/null +++ b/doc/man/make-live.1 @@ -0,0 +1,196 @@ +.TH MAKE-LIVE 1 "Mon, 4 Sep 2006" "0.99" "Debian Live framework" + +.SH NAME +make-live \- utility to build Debian Live systems + +.SH SYNOPSIS +.B make-live +.RB [\| \-a \||\| \-\-architecture +.IR ARCHITECTURE \|] +.RB [\| \-b \||\| \-\-bootappend +.IR KERNEL_PARAMETER \||\| \|"KERNEL_PARAMETERS\|" \|] +.RB [\| \-\-config +.IR FILE \|] +.RB [\| \-c \||\| \-\-chroot +.IR DIRECTORY \|] +.RB [\| \-d \||\| \-\-distribution +.IR DISTRIBUTION \|] +.RB [\| \-\-filesystem +.IR FILESYSTEM \|] +.RB [\| \-f \||\| \-\-flavour +.IR BOOTSTRAP_FLAVOUR \|] +.RB [\| \-\-hook +.IR COMMAND \||\| \|"COMMANDS\|" \||\|| FILE \|] +.RB [\| \-\-include-chroot +.IR FILE \||\| DIRECTORY \|] +.RB [\| \-\-include-image +.IR FILE \||\| DIRECTORY \|] +.RB [\| \-k \||\| \-\-kernel +.IR KERNEL_FLAVOUR \|] +.RB [ \-\-manifest +.IR PACKAGE \|] +.RB [\| \-m \||\| \-\-mirror +.IR URL \|] +.RB [\| \-\-mirror-security +.IR URL \|] +.RB [\| \-\-packages +.IR PACKAGE \||\| \|"PACKAGES\|" \|] +.RB [\| \-p \||\| \-\-package-list +.IR LIST \||\| FILE \|] +.RB [\| \-\-proxy-ftp +.IR URL \|] +.RB [\| \-\-proxy-http +.IR URL \|] +.RB [\| \-r \||\| \-\-root +.IR DIRECTORY \|] +.RB [\| \-s \||\| \-\-sections +.IR SECTION \||\| \|"SECTIONS\|" \|] +.RB [\| \-\-server-address +.IR HOSTNAME \||\| IP \|] +.RB [\| \-\-server-path +.IR DIRECTORY \|] +.RB [\| \-\-templates +.IR DIRECTORY \|] +.RB [\| \-t \||\| \-\-type +.IR TYPE \|] +.RB [\| \-\-with-generic-indices \|] +.RB [\| \-\-without-generic-indices \|] +.RB [\| \-\-with-source \|] +.RB [\| \-\-without-source \|] +.PP +.B make-live +.RB \-h \||\| \-\-help +.br +.B make-live +.RB \-u \||\| \-\-usage +.br +.B make-live +.RB \-v \||\| \-\-version + +.SH DESCRIPTION +make-live is a utility to build Debian Live systems. It takes a Debian mirror as an input and outputs a live system image (ISO image for CDs and DVDs, or tarball for netboot). make-live is still in the early stage of development, but has basic functionality and can be run successfully. + +.SH OPTIONS +.TP +.BI "\-a, \-\-architecture " ARCHITECTURE +build an image for another architecture than the autodetected one. This is usefull for e.g. building i386 images on an amd64 machine. Instead of this flag, the environment variable LIVE_ARCHITECTURE can be used (Default: `dpkg-architecture -qDEB_BUILD_ARCH`). +.TP +.BI "\-b, \-\-bootappend " KERNEL_PARAMETER \||\| \|"KERNEL_PARAMETERS\|" +passes kernel parameters to the bootloader, e.g. 'quiet' or 'vga=792' etc. Instead of this flag, the environment variable LIVE_BOOTAPPEND can be used (Default: empty). +.TP +.BI "\-\-config " FILE +uses another configuration file in addition to the default one. Settings in the additional configuration file do overwrite the settings from /etc/make-live.conf. Instead of this flag, the environment variable LIVE_CONFIG can be used (Default: /etc/make-live.conf). +.TP +.BI "\-c, \-\-chroot " DIRECTORY +specifies the chroot directory. Instead of this flag, the environment variable LIVE_CHROOT (Default: $LIVE_ROOT/chroot"). +.TP +.BI "\-d, \-\-distribution " DISTRIBUTION +specifies the distribution to be used. Allowed values are distributions names like unstable and testing, or codenames like sid and etch. Instead of this flag, the environment variable LIVE_DISTRIBUTION can be used (Default: sid). +.TP +.BI "\-\-filesystem " FILESYSTEM +Specifies the filesystem for the compressed image. At the moment, ext2, plain and squashfs are supported. Instead of this flag, the environment variable LIVE_FILESYSTEM can be used (Default: squashfs for iso, plain for net). +.TP +.BI "\-f, \-\-flavour " BOOTSTRAP_FLAVOUR +specifies the bootstrap flavour. This can be either standard or minimal. Instead of this flag, the environment variable LIVE_FLAVOUR can be used (Default: standard). +.TP +.BI "\-\-hook " COMMAND \||\| \|"COMMANDS\|" \||\|| FILE +specifies one or more commands to be executed in the chroot. Instead of this flag, the environment variable LIVE_HOOK can be used (Default: empty). +.TP +.BI "\-\-include-chroot " FILE \||\| DIRECTORY +specifies a file or a directory to be included into the chroot. Instead of this flag, the environment variable LIVE_INCLUDE_CHROOT can be used (Default: empty). +.TP +.BI "\-\-include-image " FILE \||\| DIRECTORY +specifies a file or directory which will be copied inside the image. Instead of this flag, the environment variable LIVE_INCLUDE_IMAGE can be used (Default: empty). +.TP +.BI "\-k, \-\-kernel " KERNEL_FLAVOUR +specifies the kernel image flavour. Instead of this flag, the environment variable LIVE_KERNEL can be used (Default: auto-detected). +.TP +.BI "\-\-manifest " PACKAGE +specifies the last package to install before creating the filesystem.manifest-desktop list, mainly used with ubuntu live, PACKAGE should probably be "ubuntu-live" for ubuntu desktop livecd's. Instead of this flag, the environment variable LIVE_MANIFEST can be used (Default: do not create filesystem.manifest-desktop). +.TP +.BI "\-m, \-\-mirror " URL +specifies the debian mirror where make-live will download the packages from. Instead of this flag, the environment variable LIVE_MIRROR can be used (Default: http://ftp.debian.org/debian). +.TP +.BI "\-\-mirror-security" URL +specifies the debian security mirror where make-live will download the packages from. Instead of this flag, the environment variable LIVE_MIRROR_SECURITY can be used (Default: http://security.debian.org/debian). +.TP +.BI "\-\-packages " PACKAGE \||\| \|"PACKAGES\|" +specifies a list of packages to install into the chroot. Instead of this flag, the environment variable LIVE_PACKAGES can be used (Default: empty). +.TP +.BI "\-p, \-\-package-list " FILE +specifies an external package list file, one package for each line. It overrides list option. Instead of this flag, the environment variable LIVE_PACKAGE_LIST can be used (Default: standard). +.TP +.BI "\-\-proxy-ftp " URL +specifies the value of ftp_proxy inside the chrooted environment. Instead of this flag, the environment variable LIVE_PROXY_FTP can be used (Default: empty). +.TP +.BI "\-\-proxy-http " URL +specifies the value of http_proxy inside the chrooted environment. Instead of this flag, the environment variable LIVE_PROXY_HTTP can be used (Default: empty). +.TP +.BI "\-r, \-\-root " DIRECTORY +specifies the root directory where the images/tarballs are built. Instead of this flag, the environment variable LIVE_ROOT can be used (Default: `pwd`/debian-live). +.TP +.BI "\-s, \-\-sections " SECTIONS +specifies the debian sections. Instead of this flag, the environment variable LIVE_SECTIONS can be used (Default: main). +.TP +.BI "\-\-server-address " HOSTNAME \||\| IP +specifies the server address you want to use for netboot. Instead of this flag, the environment variable LIVE_SERVER_ADDRESS can be used (Default: 192.168.1.1). +.TP +.BI "\-\-server-path" DIRECTORY +specifies the directory on the server, where you have unpacked the netboot image. Instead of this flag, the environment variable LIVE_SERVER_PATH can be used (Default: /srv/debian-live). +.TP +.BI "\-\-templates " DIRECTORY +specifies a templates directory to use instead of the default one. Instead of this flag, the environment variable LIVE_TEMPLATES can be used (Default: /usr/share/make-live/templates). +.TP +.BI "\-t, \-\-type " TYPE +specifies the image type to generate. Currently, only iso and net are available. Instead of this flag, the environment variable LIVE_TYPE can be used (Default: iso). +.TP +.B \-\-with-generic-indices +enables use of generic Debian package indices. Instead of this flag, the environment variable LIVE_GENERIC_INDICES can be used (Default: yes). +.TP +.B \-\-without-generic-indices +disables use of generic Debian package indices. Instead of this flag, the environment variable LIVE_GENERIC_INDICES can be used (Default: yes). +.TP +.B \-\-with-source +enables generation of source images. Instead of this flag, the environment variable LIVE_SOURCE can be used (Default: no). +.TP +.B \-\-without-source +disables generation of source images. Instead of this flag, the environment variable LIVE_SOURCE can be used (Default: no). +.PP +.TP +.B \-h, \-\-help +display help and exit +.TP +.B \-u, \-\-usage +show usage and exit +.TP +.B \-v, \-\-version +output version information and exit + +.SH LISTS +Every list does already include the Debian standard package selection. +.TP +.B gnome | gnome-core | gnome-full +include GNOME. +.TP +.B kde | kde-core | kde-full | kde-extra +include KDE. +.TP +.B x11 | x11-core +include X-Window-System only. +.TP +.B xfce +include Xfce. + +.SH BUGS +.B make-live +works fully on amd64 and i386, partially on alpha, hppa, ia64, mips, mipsel, powerpc, s390 and sparc. Other architectures, such as arm and m68k, as well as non-linux ports of Debian, like hurd-i386, are currently not supported. + +.SH HOMEPAGE +Debian Live project + +.SH SEE ALSO +.BR make-live.conf(8) + +.SH AUTHOR +make-live was written by Daniel Baumann and Marco Amadori +. diff --git a/doc/man/make-live.8 b/doc/man/make-live.8 deleted file mode 100644 index 405c70f..0000000 --- a/doc/man/make-live.8 +++ /dev/null @@ -1,196 +0,0 @@ -.TH MAKE-LIVE 8 "Mon, 4 Sep 2006" "0.99" "Debian Live framework" - -.SH NAME -make-live \- utility to build Debian Live systems - -.SH SYNOPSIS -.B make-live -.RB [\| \-a \||\| \-\-architecture -.IR ARCHITECTURE \|] -.RB [\| \-b \||\| \-\-bootappend -.IR KERNEL_PARAMETER \||\| \|"KERNEL_PARAMETERS\|" \|] -.RB [\| \-\-config -.IR FILE \|] -.RB [\| \-c \||\| \-\-chroot -.IR DIRECTORY \|] -.RB [\| \-d \||\| \-\-distribution -.IR DISTRIBUTION \|] -.RB [\| \-\-filesystem -.IR FILESYSTEM \|] -.RB [\| \-f \||\| \-\-flavour -.IR BOOTSTRAP_FLAVOUR \|] -.RB [\| \-\-hook -.IR COMMAND \||\| \|"COMMANDS\|" \||\|| FILE \|] -.RB [\| \-\-include-chroot -.IR FILE \||\| DIRECTORY \|] -.RB [\| \-\-include-image -.IR FILE \||\| DIRECTORY \|] -.RB [\| \-k \||\| \-\-kernel -.IR KERNEL_FLAVOUR \|] -.RB [ \-\-manifest -.IR PACKAGE \|] -.RB [\| \-m \||\| \-\-mirror -.IR URL \|] -.RB [\| \-\-mirror-security -.IR URL \|] -.RB [\| \-\-packages -.IR PACKAGE \||\| \|"PACKAGES\|" \|] -.RB [\| \-p \||\| \-\-package-list -.IR LIST \||\| FILE \|] -.RB [\| \-\-proxy-ftp -.IR URL \|] -.RB [\| \-\-proxy-http -.IR URL \|] -.RB [\| \-r \||\| \-\-root -.IR DIRECTORY \|] -.RB [\| \-s \||\| \-\-sections -.IR SECTION \||\| \|"SECTIONS\|" \|] -.RB [\| \-\-server-address -.IR HOSTNAME \||\| IP \|] -.RB [\| \-\-server-path -.IR DIRECTORY \|] -.RB [\| \-\-templates -.IR DIRECTORY \|] -.RB [\| \-t \||\| \-\-type -.IR TYPE \|] -.RB [\| \-\-with-generic-indices \|] -.RB [\| \-\-without-generic-indices \|] -.RB [\| \-\-with-source \|] -.RB [\| \-\-without-source \|] -.PP -.B make-live -.RB \-h \||\| \-\-help -.br -.B make-live -.RB \-u \||\| \-\-usage -.br -.B make-live -.RB \-v \||\| \-\-version - -.SH DESCRIPTION -make-live is a utility to build Debian Live systems. It takes a Debian mirror as an input and outputs a live system image (ISO image for CDs and DVDs, or tarball for netboot). make-live is still in the early stage of development, but has basic functionality and can be run successfully. - -.SH OPTIONS -.TP -.BI "\-a, \-\-architecture " ARCHITECTURE -build an image for another architecture than the autodetected one. This is usefull for e.g. building i386 images on an amd64 machine. Instead of this flag, the environment variable LIVE_ARCHITECTURE can be used (Default: `dpkg-architecture -qDEB_BUILD_ARCH`). -.TP -.BI "\-b, \-\-bootappend " KERNEL_PARAMETER \||\| \|"KERNEL_PARAMETERS\|" -passes kernel parameters to the bootloader, e.g. 'quiet' or 'vga=792' etc. Instead of this flag, the environment variable LIVE_BOOTAPPEND can be used (Default: empty). -.TP -.BI "\-\-config " FILE -uses another configuration file in addition to the default one. Settings in the additional configuration file do overwrite the settings from /etc/make-live.conf. Instead of this flag, the environment variable LIVE_CONFIG can be used (Default: /etc/make-live.conf). -.TP -.BI "\-c, \-\-chroot " DIRECTORY -specifies the chroot directory. Instead of this flag, the environment variable LIVE_CHROOT (Default: $LIVE_ROOT/chroot"). -.TP -.BI "\-d, \-\-distribution " DISTRIBUTION -specifies the distribution to be used. Allowed values are distributions names like unstable and testing, or codenames like sid and etch. Instead of this flag, the environment variable LIVE_DISTRIBUTION can be used (Default: sid). -.TP -.BI "\-\-filesystem " FILESYSTEM -Specifies the filesystem for the compressed image. At the moment, ext2, plain and squashfs are supported. Instead of this flag, the environment variable LIVE_FILESYSTEM can be used (Default: squashfs for iso, plain for net). -.TP -.BI "\-f, \-\-flavour " BOOTSTRAP_FLAVOUR -specifies the bootstrap flavour. This can be either standard or minimal. Instead of this flag, the environment variable LIVE_FLAVOUR can be used (Default: standard). -.TP -.BI "\-\-hook " COMMAND \||\| \|"COMMANDS\|" \||\|| FILE -specifies one or more commands to be executed in the chroot. Instead of this flag, the environment variable LIVE_HOOK can be used (Default: empty). -.TP -.BI "\-\-include-chroot " FILE \||\| DIRECTORY -specifies a file or a directory to be included into the chroot. Instead of this flag, the environment variable LIVE_INCLUDE_CHROOT can be used (Default: empty). -.TP -.BI "\-\-include-image " FILE \||\| DIRECTORY -specifies a file or directory which will be copied inside the image. Instead of this flag, the environment variable LIVE_INCLUDE_IMAGE can be used (Default: empty). -.TP -.BI "\-k, \-\-kernel " KERNEL_FLAVOUR -specifies the kernel image flavour. Instead of this flag, the environment variable LIVE_KERNEL can be used (Default: auto-detected). -.TP -.BI "\-\-manifest " PACKAGE -specifies the last package to install before creating the filesystem.manifest-desktop list, mainly used with ubuntu live, PACKAGE should probably be "ubuntu-live" for ubuntu desktop livecd's. Instead of this flag, the environment variable LIVE_MANIFEST can be used (Default: do not create filesystem.manifest-desktop). -.TP -.BI "\-m, \-\-mirror " URL -specifies the debian mirror where make-live will download the packages from. Instead of this flag, the environment variable LIVE_MIRROR can be used (Default: http://ftp.debian.org/debian). -.TP -.BI "\-\-mirror-security" URL -specifies the debian security mirror where make-live will download the packages from. Instead of this flag, the environment variable LIVE_MIRROR_SECURITY can be used (Default: http://security.debian.org/debian). -.TP -.BI "\-\-packages " PACKAGE \||\| \|"PACKAGES\|" -specifies a list of packages to install into the chroot. Instead of this flag, the environment variable LIVE_PACKAGES can be used (Default: empty). -.TP -.BI "\-p, \-\-package-list " FILE -specifies an external package list file, one package for each line. It overrides list option. Instead of this flag, the environment variable LIVE_PACKAGE_LIST can be used (Default: standard). -.TP -.BI "\-\-proxy-ftp " URL -specifies the value of ftp_proxy inside the chrooted environment. Instead of this flag, the environment variable LIVE_PROXY_FTP can be used (Default: empty). -.TP -.BI "\-\-proxy-http " URL -specifies the value of http_proxy inside the chrooted environment. Instead of this flag, the environment variable LIVE_PROXY_HTTP can be used (Default: empty). -.TP -.BI "\-r, \-\-root " DIRECTORY -specifies the root directory where the images/tarballs are built. Instead of this flag, the environment variable LIVE_ROOT can be used (Default: `pwd`/debian-live). -.TP -.BI "\-s, \-\-sections " SECTIONS -specifies the debian sections. Instead of this flag, the environment variable LIVE_SECTIONS can be used (Default: main). -.TP -.BI "\-\-server-address " HOSTNAME \||\| IP -specifies the server address you want to use for netboot. Instead of this flag, the environment variable LIVE_SERVER_ADDRESS can be used (Default: 192.168.1.1). -.TP -.BI "\-\-server-path" DIRECTORY -specifies the directory on the server, where you have unpacked the netboot image. Instead of this flag, the environment variable LIVE_SERVER_PATH can be used (Default: /srv/debian-live). -.TP -.BI "\-\-templates " DIRECTORY -specifies a templates directory to use instead of the default one. Instead of this flag, the environment variable LIVE_TEMPLATES can be used (Default: /usr/share/make-live/templates). -.TP -.BI "\-t, \-\-type " TYPE -specifies the image type to generate. Currently, only iso and net are available. Instead of this flag, the environment variable LIVE_TYPE can be used (Default: iso). -.TP -.B \-\-with-generic-indices -enables use of generic Debian package indices. Instead of this flag, the environment variable LIVE_GENERIC_INDICES can be used (Default: yes). -.TP -.B \-\-without-generic-indices -disables use of generic Debian package indices. Instead of this flag, the environment variable LIVE_GENERIC_INDICES can be used (Default: yes). -.TP -.B \-\-with-source -enables generation of source images. Instead of this flag, the environment variable LIVE_SOURCE can be used (Default: no). -.TP -.B \-\-without-source -disables generation of source images. Instead of this flag, the environment variable LIVE_SOURCE can be used (Default: no). -.PP -.TP -.B \-h, \-\-help -display help and exit -.TP -.B \-u, \-\-usage -show usage and exit -.TP -.B \-v, \-\-version -output version information and exit - -.SH LISTS -Every list does already include the Debian standard package selection. -.TP -.B gnome | gnome-core | gnome-full -include GNOME. -.TP -.B kde | kde-core | kde-full | kde-extra -include KDE. -.TP -.B x11 | x11-core -include X-Window-System only. -.TP -.B xfce -include Xfce. - -.SH BUGS -.B make-live -works fully on amd64 and i386, partially on alpha, hppa, ia64, mips, mipsel, powerpc, s390 and sparc. Other architectures, such as arm and m68k, as well as non-linux ports of Debian, like hurd-i386, are currently not supported. - -.SH HOMEPAGE -Debian Live project - -.SH SEE ALSO -.BR make-live.conf(8) - -.SH AUTHOR -make-live was written by Daniel Baumann and Marco Amadori -. diff --git a/doc/man/make-live.conf.5 b/doc/man/make-live.conf.5 new file mode 100644 index 0000000..27c8e43 --- /dev/null +++ b/doc/man/make-live.conf.5 @@ -0,0 +1,94 @@ +.TH MAKE-LIVE.CONF 5 "Mon, 4 Sep 2006" "0.99" "Debian Live framework" + +.SH NAME +make-live.conf \- configuration file for make-live(8) + +.SH DESCRIPTION +make-live is a utility to build Debian Live systems. It takes a Debian mirror as an input and outputs a live system image (ISO image for CDs and DVDs, or tarball for netboot). make-live is still in the early stage of development, but has basic functionality and can be run successfully. + +.SH ENVIRONMENT +.TP +.B LIVE_ARCHITECTURE +build an image for another architecture than the autodetected one. This is usefull for e.g. building i386 images on an amd64 machine. Instead of this environment variable, the flag \-a, \-\-architecture can be used (Default: `dpkg-architecture -qDEB_BUILD_ARCH`). +.TP +.B LIVE_BOOTAPPEND +specifies additional bootparameters to the kernel (Default: none). +.TP +.B LIVE_CONFIG +uses another configuration file in addition to the default one, if existing, in /etc/make-live.conf. Settings in the additional configuration file do overwrite the settings from /etc/make-live.conf. Instead of this variable, the flag \-c or \-\-config can be used (Default: empty). +.TP +.B LIVE_DISTRIBUTION +specifies the distribution to be used. Allowed values are all Debian distributions (oldstable, stable, testing, unstable), although only unstable (default) is possible for now. Instead of this environment variable, the flag \-d, \-\-distribution can be used (Default: unstable). +.TP +.B LIVE_FLAVOUR +specifies the bootstrap flavour. This can be either standard (default) or minimal. Instead of this environment variable, the flag \-f, \-\-flavour can be used. +.TP +.B LIVE_FILESYSTEM +specifies the filesystem to be used for the root filesystem image +(Default: squashfs). +.TP +.B LIVE_GENERIC_INDICES +specifies if generic Debian indices should be used (Default: enable). +.TP +.B LIVE_FTPPROXY +specifies the value of ftp_proxy inside the chrooted environment. Instead of this environment variable, the flag \-\-ftp-proxy can be used (Default: empty). +.TP +.B LIVE_HOOK +specifies one or more commands to be executed in the chroot. Instead of this environment variable, the flag \-\-hook can be used (Default: empty). +.TP +.B LIVE_INCLUDE_ROOT +specifies a file or a directory to be included into the chroot. Instead of this environment variable. the flag \-\-include-root can be used (Default: empty). +.TP +.B LIVE_KERNEL +specifies the kernel image flavour. Instead of this environment variable, the flag \-k, \-\-kernel can be used. +.TP +.BI LIVE_MANIFEST +specifies the last package to install before creating the filesystem.manifest-desktop list, mainly used with ubuntu live, in those system it should probably be set to "ubuntu-live" for ubuntu desktop livecd's (Default: do not create filesystem.manifest-desktop). +.TP +.B LIVE_MIRROR +specifies the debian mirror where make-live will download the packages from. Instead of this environment variable, the flag \-m, \-\-mirror LIVE_MIRROR can be used (Default: http://ftp.debian.org/debian). +.B LIVE_MIRROR_KEY +specifies the archive signing key. Instead of this environment variable, the flav \-\-mirror-key can be used (Default: http://ftp-master.debian.org/ziyi_key_2006.asc). +.TP +.B LIVE_PACKAGES +specifies a list of packages to install into the chroot. Instead of this environment variable, the flag \-\-packakges can be used (Default: empty). +.TP +.B LIVE_PACKAGE_LIST +specifies a file which contains a list of packages to install. +.TP +.B LIVE_PROXY_FTP +specifies the value of ftp_proxy inside the chrooted environment. Instead of this environment variable, the flag \-\-ftp-proxy can be used (Default: empty). +.TP +.B LIVE_PROXY_HTTP +specifies the value of http_proxy inside the chrooted environment. Instead of this environment variable, the flag \-\-http-proxy can be used (Default: empty). +.TP +.B LIVE_ROOT +specifies the root directory where the images/tarballs are built. Instead of this environment variable, the flag \-r or \-\-root can bse used (Default: `pwd`/debian-live). +.B LIVE_SECTIONS +specifies the debian sections. Instead of this environment variable, the flag \-s, \-\-sections can be used (Default: main). +.B LIVE_SERVER_ADDRESS +specifies the IP address or hostname of the netboot server (Default: none). +.TP +.B LIVE_SERVER_PATH +specifies the directory of the chroot on the netboot server (Default: none). +.TP +.B LIVE_TEMPLATES +specifies a directory to be used for templates instead of the default one. +(Default: "/usr/share/make-live/templates") +.TP +.B LIVE_TYPE +specifies the image type. + +.SH BUGS +.B make-live +works fully on amd64 and i386, partially on alpha, hppa, ia64, mips, mipsel, powerpc, s390 and sparc. Other architectures, such as arm and m68k, as well as non-linux ports of Debian, like hurd-i386, are currently not supported. + +.SH HOMEPAGE +Debian Live project + +.SH SEE ALSO +.BR make-live(8) + +.SH AUTHOR +make-live was written by Daniel Baumann and Marco Amadori +. diff --git a/doc/man/make-live.conf.8 b/doc/man/make-live.conf.8 deleted file mode 100644 index 312ea8c..0000000 --- a/doc/man/make-live.conf.8 +++ /dev/null @@ -1,94 +0,0 @@ -.TH MAKE-LIVE.CONF 8 "Mon, 4 Sep 2006" "0.99" "Debian Live framework" - -.SH NAME -make-live.conf \- configuration file for make-live(8) - -.SH DESCRIPTION -make-live is a utility to build Debian Live systems. It takes a Debian mirror as an input and outputs a live system image (ISO image for CDs and DVDs, or tarball for netboot). make-live is still in the early stage of development, but has basic functionality and can be run successfully. - -.SH ENVIRONMENT -.TP -.B LIVE_ARCHITECTURE -build an image for another architecture than the autodetected one. This is usefull for e.g. building i386 images on an amd64 machine. Instead of this environment variable, the flag \-a, \-\-architecture can be used (Default: `dpkg-architecture -qDEB_BUILD_ARCH`). -.TP -.B LIVE_BOOTAPPEND -specifies additional bootparameters to the kernel (Default: none). -.TP -.B LIVE_CONFIG -uses another configuration file in addition to the default one, if existing, in /etc/make-live.conf. Settings in the additional configuration file do overwrite the settings from /etc/make-live.conf. Instead of this variable, the flag \-c or \-\-config can be used (Default: empty). -.TP -.B LIVE_DISTRIBUTION -specifies the distribution to be used. Allowed values are all Debian distributions (oldstable, stable, testing, unstable), although only unstable (default) is possible for now. Instead of this environment variable, the flag \-d, \-\-distribution can be used (Default: unstable). -.TP -.B LIVE_FLAVOUR -specifies the bootstrap flavour. This can be either standard (default) or minimal. Instead of this environment variable, the flag \-f, \-\-flavour can be used. -.TP -.B LIVE_FILESYSTEM -specifies the filesystem to be used for the root filesystem image -(Default: squashfs). -.TP -.B LIVE_GENERIC_INDICES -specifies if generic Debian indices should be used (Default: enable). -.TP -.B LIVE_FTPPROXY -specifies the value of ftp_proxy inside the chrooted environment. Instead of this environment variable, the flag \-\-ftp-proxy can be used (Default: empty). -.TP -.B LIVE_HOOK -specifies one or more commands to be executed in the chroot. Instead of this environment variable, the flag \-\-hook can be used (Default: empty). -.TP -.B LIVE_INCLUDE_ROOT -specifies a file or a directory to be included into the chroot. Instead of this environment variable. the flag \-\-include-root can be used (Default: empty). -.TP -.B LIVE_KERNEL -specifies the kernel image flavour. Instead of this environment variable, the flag \-k, \-\-kernel can be used. -.TP -.BI LIVE_MANIFEST -specifies the last package to install before creating the filesystem.manifest-desktop list, mainly used with ubuntu live, in those system it should probably be set to "ubuntu-live" for ubuntu desktop livecd's (Default: do not create filesystem.manifest-desktop). -.TP -.B LIVE_MIRROR -specifies the debian mirror where make-live will download the packages from. Instead of this environment variable, the flag \-m, \-\-mirror LIVE_MIRROR can be used (Default: http://ftp.debian.org/debian). -.B LIVE_MIRROR_KEY -specifies the archive signing key. Instead of this environment variable, the flav \-\-mirror-key can be used (Default: http://ftp-master.debian.org/ziyi_key_2006.asc). -.TP -.B LIVE_PACKAGES -specifies a list of packages to install into the chroot. Instead of this environment variable, the flag \-\-packakges can be used (Default: empty). -.TP -.B LIVE_PACKAGE_LIST -specifies a file which contains a list of packages to install. -.TP -.B LIVE_PROXY_FTP -specifies the value of ftp_proxy inside the chrooted environment. Instead of this environment variable, the flag \-\-ftp-proxy can be used (Default: empty). -.TP -.B LIVE_PROXY_HTTP -specifies the value of http_proxy inside the chrooted environment. Instead of this environment variable, the flag \-\-http-proxy can be used (Default: empty). -.TP -.B LIVE_ROOT -specifies the root directory where the images/tarballs are built. Instead of this environment variable, the flag \-r or \-\-root can bse used (Default: `pwd`/debian-live). -.B LIVE_SECTIONS -specifies the debian sections. Instead of this environment variable, the flag \-s, \-\-sections can be used (Default: main). -.B LIVE_SERVER_ADDRESS -specifies the IP address or hostname of the netboot server (Default: none). -.TP -.B LIVE_SERVER_PATH -specifies the directory of the chroot on the netboot server (Default: none). -.TP -.B LIVE_TEMPLATES -specifies a directory to be used for templates instead of the default one. -(Default: "/usr/share/make-live/templates") -.TP -.B LIVE_TYPE -specifies the image type. - -.SH BUGS -.B make-live -works fully on amd64 and i386, partially on alpha, hppa, ia64, mips, mipsel, powerpc, s390 and sparc. Other architectures, such as arm and m68k, as well as non-linux ports of Debian, like hurd-i386, are currently not supported. - -.SH HOMEPAGE -Debian Live project - -.SH SEE ALSO -.BR make-live(8) - -.SH AUTHOR -make-live was written by Daniel Baumann and Marco Amadori -. diff --git a/src/config b/src/config index a039aef..a319ada 100644 --- a/src/config +++ b/src/config @@ -63,6 +63,28 @@ # Chroots http_proxy (Default: empty) #LIVE_PROXY_HTTP="" +# Custom repositories (Default: none) +#LIVE_REPOSITORIES="" + +# Custom repository list +LIVE_REPOSITORY_bpo="http://www.backports.org/debian/" +LIVE_REPOSITORY_KEY_bpo="http://backports.org/debian/archive.key" +LIVE_REPOSITORY_KEYRING_bpo="" +LIVE_REPOSITORY_DISTRIBUTION="" +LIVE_REPOSITORY_SECTIONS_bpo="main contrib non-free" + +LIVE_REPOSITORY_edu="http://ftp.skolelinux.org/skolelinux/" +LIVE_REPOSITORY_KEY_edu="" +LIVE_REPOSITORY_KEYRING_edu="debian-edu-archive-keyring" +LIVE_REPOSITORY_DISTRIBUTION_edu="etch-test" +LIVE_REPOSITORY_SECTIONS_edu="local" + +LIVE_REPOSITORY_duo="http://ftp.debian-unofficial.org/debian/" +LIVE_REPOSITORY_KEY_duo="http://ftp-master.debian-unofficial.org/key_2006.asc" +LIVE_REPOSITORY_KEYRING_duo="" +LIVE_REPOSITORY_DISTRIBUTION="" +LIVE_REPOSITORY_SECTIONS_duo="main contrib non-free restricted" + # Debian section (Default: main) #LIVE_SECTION="main" diff --git a/src/lists/minimal b/src/lists/minimal index d57bbc2..b6c29c0 100644 --- a/src/lists/minimal +++ b/src/lists/minimal @@ -1,4 +1,4 @@ # /usr/share/make-live/lists/minimal - package list for make-live(8) # Minimal -eject nvi sudo +eject vim-tiny sudo diff --git a/src/main.sh b/src/main.sh index a6ccf85..aa2e246 100755 --- a/src/main.sh +++ b/src/main.sh @@ -28,7 +28,7 @@ set -e BASE="/usr/share/make-live" CONFIG="/etc/make-live.conf" PROGRAM="`basename ${0}`" -VERSION="0.99.8" +VERSION="0.99.9" CODENAME_OLDSTABLE="woody" CODENAME_STABLE="sarge" @@ -41,7 +41,7 @@ do . "${SCRIPT}" done -USAGE="Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [--disable-generic-indices] [--enable-generic-indices] [--filesystem FILESYSTEM] [-f|--flavour BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [-k|--kernel KERNEL_FLAVOUR] [--manifest PACKAGE] [-m|--mirror URL] [--mirror-security URL] [--packages PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--proxy-ftp URL] [--proxy-http URL] [-r|--root DIRECTORY] [-s|--section SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--templates DIRECTORY] [-t|--type TYPE]" +USAGE="Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [--disable-generic-indices] [--enable-generic-indices] [--filesystem FILESYSTEM] [-f|--flavour BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [-k|--kernel KERNEL_FLAVOUR] [--manifest PACKAGE] [-m|--mirror URL] [--mirror-security URL] [--packages PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--proxy-ftp URL] [--proxy-http URL] [--repositories NAME] [-r|--root DIRECTORY] [-s|--section SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--templates DIRECTORY] [-t|--type TYPE]" Help () { @@ -81,6 +81,7 @@ Help () echo " --mirror-security: specifies debian security mirror." echo " --packages: specifies aditional packages." echo " -p, --package-list: specifies additonal package list." + echo " --repositories: specifies custom repositories." echo " -r, --root: specifies build root." echo " --proxy-ftp: specifies \${ftp_proxy}." echo " --proxy-http: specifies \${http_proxy}." @@ -158,7 +159,7 @@ Configuration () Main () { - ARGUMENTS="`getopt --longoptions root:,type:,architecture:,bootappend:,config:,chroot:,distribution:,filesystem:,flavour:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,proxy-http:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:f:k:m:o:p:s:huv --shell sh -- "${@}"`" + ARGUMENTS="`getopt --longoptions root:,type:,architecture:,bootappend:,config:,chroot:,distribution:,filesystem:,flavour:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,proxy-http:,repositories:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:f:k:m:o:p:s:huv --shell sh -- "${@}"`" if [ "${?}" != "0" ] then @@ -254,6 +255,10 @@ Main () LIVE_PROXY_HTTP="${2}"; shift 2 ;; + --repositories) + LIVE_REPOSITORIES="${2}"; shift 2 + ;; + -s|--section) LIVE_SECTION="${2}"; shift 2 ;; diff --git a/src/scripts/11bootstrap.sh b/src/scripts/11bootstrap.sh index f0a6715..f2f6c0a 100644 --- a/src/scripts/11bootstrap.sh +++ b/src/scripts/11bootstrap.sh @@ -13,6 +13,17 @@ Bootstrap () { if [ ! -f "${LIVE_ROOT}"/.stage/bootstrap ] then + # Use proxy + if [ -n "${LIVE_PROXY_FTP}" ] && [ -z "${ftp_proxy}" ] + then + export ftp_proxy="${LIVE_PROXY_FTP}" + fi + + if [ -n "${LIVE_PROXY_HTTP}" ] && [ -z "${http_proxy}" ] + then + export http_proxy="${LIVE_PROXY_HTTP}" + fi + # Create chroot directory if [ ! -d "${LIVE_CHROOT}" ] then diff --git a/src/scripts/14chroot.sh b/src/scripts/14chroot.sh index 356c1a2..e264128 100644 --- a/src/scripts/14chroot.sh +++ b/src/scripts/14chroot.sh @@ -36,6 +36,22 @@ Chroot () if [ "${LIVE_FLAVOUR}" != "minimal" ] then Chroot_exec "apt-get install --yes --force-yes debian-archive-keyring" + + for NAME in ${LIVE_REPOSITORIES} + do + eval REPOSITORY_KEY="$`echo LIVE_REPOSITORY_KEY_$NAME`" + eval REPOSITORY_KEYRING="$`echo LIVE_REPOSITORY_KEYRING_$NAME`" + + if [ -n "${REPOSITORY_KEYRING}" ] + then + Chroot_exec "apt-get install ${REPOSITORY_KEYRING}" + elif [ -n "${REPOSITORY_KEY}" ] + then + Chroot_exec "wget ${REPOSITORY_KEY}" + Chroot_exec "apt-key add `basename ${REPOSITORY_KEY}`" + Chroot_exec "rm -f `basename ${REPOSITORY_KEY}`" + fi + done fi fi diff --git a/src/scripts/21image.sh b/src/scripts/21image.sh index 7258b6a..1bab3e1 100644 --- a/src/scripts/21image.sh +++ b/src/scripts/21image.sh @@ -93,6 +93,25 @@ EOF ;; esac + # Add custom repositories + echo "" >> "${LIVE_CHROOT}"/etc/apt/sources.list + echo "# Custom repositories" >> "${LIVE_CHROOT}"/etc/apt/sources.list + + for NAME in ${LIVE_REPOSITORIES} + do + eval REPOSITORY="$`echo LIVE_REPOSITORY_$NAME`" + eval REPOSITORY_DISTRIBUTION="$`echo LIVE_REPOSITORY_DISTRIBUTION_$NAME`" + eval REPOSITORY_SECTIONS="$`echo LIVE_REPOSITORY_SECTIONS_$NAME`" + + # Configure /etc/apt/sources.list + if [ -n "${REPOSITORY_DISTRIBUTION}" ] + then + echo "deb ${REPOSITORY} ${REPOSITORY_DISTRIBUTION} ${REPOSITORY_SECTIONS}" >> "${LIVE_CHROOT}"/etc/apt/sources.list + else + echo "deb ${REPOSITORY} ${LIVE_DISTRIBUTION} ${REPOSITORY_SECTIONS}" >> "${LIVE_CHROOT}"/etc/apt/sources.list + fi + done + # Update indices Chroot_exec "apt-get update" @@ -192,6 +211,7 @@ Linuximage () then mv "${LIVE_CHROOT}"/boot/vmlinuz-* "${LIVE_ROOT}"/binary/isolinux/vmlinuz mv "${LIVE_CHROOT}"/boot/initrd.img-* "${LIVE_ROOT}"/binary/isolinux/initrd.gz + rm -f "${LIVE_CHROOT}"/vmlinuz "${LIVE_CHROOT}"/initrd.img else cp "${LIVE_CHROOT}"/boot/vmlinuz-* "${LIVE_ROOT}"/binary/isolinux/vmlinuz cp "${LIVE_CHROOT}"/boot/initrd.img-* "${LIVE_ROOT}"/binary/isolinux/initrd.gz -- cgit v1.0