From b7d07a269e4a2d1bac730e177bc6826a7cd450d5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 23 Sep 2007 10:04:36 +0200 Subject: Adding live-package 0.99.14-1. --- AUTHORS | 2 + ChangeLog | 18 ++++ Makefile | 7 +- debian/changelog | 12 +++ doc/man/make-live.1 | 210 --------------------------------------------- doc/man/make-live.8 | 210 +++++++++++++++++++++++++++++++++++++++++++++ src/main.sh | 20 +++-- src/scripts/02defaults.sh | 12 ++- src/scripts/11bootstrap.sh | 2 +- src/scripts/12patch.sh | 10 ++- src/scripts/14chroot.sh | 28 +++--- src/scripts/21image.sh | 19 ++-- src/scripts/23net.sh | 2 +- 13 files changed, 310 insertions(+), 242 deletions(-) delete mode 100644 doc/man/make-live.1 create mode 100644 doc/man/make-live.8 diff --git a/AUTHORS b/AUTHORS index cc8f0f1..6bf8420 100644 --- a/AUTHORS +++ b/AUTHORS @@ -8,6 +8,8 @@ Patches (alphabetical order): * Alex Owen * Bas Wijnen * Frederic Lehobey + * Guerkan Senguen * Jason D. Clinton * Marcelo D. Re + * Markus Bauer * Otavio Salvador diff --git a/ChangeLog b/ChangeLog index 4580293..09d583f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2006-11-05 Daniel Baumann + + * Applied patch from Markus Bauer : + - fixing script sourcing to exclude files in .svn + +2006-11-03 Daniel Baumann + + * Fixed typo in the policy-rc.d hack. + +2006-11-02 Daniel Baumann + + * Using aptitude instead of apt-get. + * Added '--with-recommends' and '--without-recommends'. + +2006-11-01 Daniel Baumann + + * Fixed regression when using -d ${CODENAME} wrt/ kernel packages. + 2006-10-29 Daniel Baumann * Added minimal-net flavour. diff --git a/Makefile b/Makefile index b35adbc..ec21f48 100644 --- a/Makefile +++ b/Makefile @@ -30,10 +30,10 @@ install: install -m 0644 doc/*.txt $(DESTDIR)/usr/share/doc/live-package @# Install manpages - 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 + install -d -m 0755 $(DESTDIR)/usr/share/man/man8 + install -m 0644 doc/man/*.8 $(DESTDIR)/usr/share/man/man8 uninstall: # Uninstalling make-live @@ -50,6 +50,7 @@ uninstall: rm -rf $(DESTDIR)/usr/share/doc/live-package @# Remove manpages - rm -f $(DESTDIR)/usr/share/man/man1/make-live.* + rm -f $(DESTDIR)/usr/share/man/man5/make-live.* + rm -f $(DESTDIR)/usr/share/man/man8/make-live.* reinstall: uninstall install diff --git a/debian/changelog b/debian/changelog index ab3a683..672c2f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +live-package (0.99.14-1) unstable; urgency=medium + + * New upstream release: + - fixed typo for policy-rc.d hack (Closes: #396813), thanks to + Markus Bauer . + - corrected manpage section (Closes: #396083), thanks to + Sune Vuorela . + - fixes script sourcing to exclude files in .svn (Closes: #396861), + thanks to Markus Bauer . + + -- Daniel Baumann Mon, 6 Nov 2006 00:00:00 +0200 + live-package (0.99.13-1) unstable; urgency=medium * New upstream release. diff --git a/doc/man/make-live.1 b/doc/man/make-live.1 deleted file mode 100644 index 10d156a..0000000 --- a/doc/man/make-live.1 +++ /dev/null @@ -1,210 +0,0 @@ -.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 [\| \-\-clone -.IR DIRECTORY \|] -.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 [\| \-\-preseed -.IR FILE \|] -.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 "\-\-clone " DIRECTORY -Clones the package selection and configuration from a given root directory. It -will output the settings to $LIVE_ROOT/preseed.cloned and $LIVE_ROOT/plist.clone -for easy reuse with \-\-preseed and \-\-package-list. Instead of this flag, the -environment variable LIVE_CLONE can be used. -.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 "\-\-preseed " FILE -clone the packages selection and configuration from the provided -root directory. -.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(5) - -.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 new file mode 100644 index 0000000..ac06c68 --- /dev/null +++ b/doc/man/make-live.8 @@ -0,0 +1,210 @@ +.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 [\| \-\-clone +.IR DIRECTORY \|] +.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 [\| \-\-preseed +.IR FILE \|] +.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 "\-\-clone " DIRECTORY +Clones the package selection and configuration from a given root directory. It +will output the settings to $LIVE_ROOT/preseed.cloned and $LIVE_ROOT/plist.clone +for easy reuse with \-\-preseed and \-\-package-list. Instead of this flag, the +environment variable LIVE_CLONE can be used. +.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 "\-\-preseed " FILE +clone the packages selection and configuration from the provided +root directory. +.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(5) + +.SH AUTHOR +make-live was written by Daniel Baumann and Marco Amadori +. diff --git a/src/main.sh b/src/main.sh index 0e3cb03..cfffd83 100755 --- a/src/main.sh +++ b/src/main.sh @@ -28,7 +28,7 @@ set -e BASE=${LIVE_BASE:-"/usr/share/make-live"} CONFIG="/etc/make-live.conf" PROGRAM="`basename ${0}`" -VERSION="0.99.13" +VERSION="0.99.14" CODENAME_OLDSTABLE="woody" CODENAME_STABLE="sarge" @@ -36,12 +36,12 @@ CODENAME_TESTING="etch" CODENAME_UNSTABLE="sid" # Source sub scripts -for SCRIPT in `find ${BASE}/scripts/ -not -name '*~' -and -type f` +for SCRIPT in `find ${BASE}/scripts/ -not -name '*~' -not -wholename "${BASE}/scripts/.*" -and -type f` do . "${SCRIPT}" done -USAGE="Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--clone DIRECTORY] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [--with-generic-indices] [--without-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] [--preseed 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]" +USAGE="Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--clone DIRECTORY] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [--with-generic-indices] [--without-generic-indices] [--with-recommends] [--without-recommends] [--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] [--preseed 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 () { @@ -93,9 +93,11 @@ Help () echo " -t, --type: specifies live system type." echo " --with-generic-indices: enables generic debian package indices (default)." echo " --without-generic-indices: disables generic debian package indices." + echo " --with-recommends: installes recommended packages too." + echo " --without-recommends: does not install recommended packages (default)." echo echo "Environment:" - echo " All settings can be also specified trough environment variables. Please see make-live.conf(8) for more information." + echo " All settings can be also specified trough environment variables. Please see make-live.conf(5) for more information." echo echo "Report bugs to Debian Live project ." exit 0 @@ -162,7 +164,7 @@ Configuration () Main () { - ARGUMENTS="`getopt --longoptions root:,type:,architecture:,bootappend:,clone:,config:,chroot:,distribution:,filesystem:,flavour:,bootstrap-config:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,preseed:,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 -- "${@}"`" + ARGUMENTS="`getopt --longoptions root:,type:,architecture:,bootappend:,clone:,config:,chroot:,distribution:,filesystem:,flavour:,bootstrap-config:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,preseed:,proxy-http:,repositories:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-recommends,without-recommends,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 @@ -297,6 +299,14 @@ Main () LIVE_GENERIC_INDICES="no"; shift ;; + --with-recommends) + LIVE_RECOMMENDS="yes"; shift + ;; + + --without-recommends) + LIVE_RECOMMENDS="no"; shift + ;; + --with-source) LIVE_SOURCE="yes"; shift ;; diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh index f0ef328..410332c 100644 --- a/src/scripts/02defaults.sh +++ b/src/scripts/02defaults.sh @@ -86,7 +86,8 @@ Defaults () ;; amd64) - if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "testing" ] + if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ] || \ + [ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ] then LIVE_KERNEL="amd64" else @@ -104,7 +105,8 @@ Defaults () ;; i386) - if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "stable" ] + if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_OLDSTABLE}" ] || \ + [ "${LIVE_DISTRIBUTION}" = "stable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_STABLE}" ] then LIVE_KERNEL="386" else @@ -235,6 +237,12 @@ Defaults () LIVE_GENERIC_INDICES="yes" fi + # Set recommends + if [ -z "${LIVE_RECOMMENDS}" ] + then + LIVE_RECOMMENDS="no" + fi + # Set source image if [ -z "${LIVE_SOURCE}" ] then diff --git a/src/scripts/11bootstrap.sh b/src/scripts/11bootstrap.sh index 9aee5ec..7247223 100644 --- a/src/scripts/11bootstrap.sh +++ b/src/scripts/11bootstrap.sh @@ -27,7 +27,7 @@ Bootstrap () cdebootstrap --arch="${LIVE_ARCHITECTURE}" --flavour="${LIVE_FLAVOUR}" ${SUITE_CONFIG} "${LIVE_DISTRIBUTION}" "${LIVE_CHROOT}" "${LIVE_MIRROR}" # Remove unused packages - Chroot_exec "apt-get remove --purge --yes cdebootstrap-helper-diverts" + Chroot_exec "dpkg -P cdebootstrap-helper-diverts" # Remove package cache rm -rf "${LIVE_CHROOT}"/var/cache/bootstrap diff --git a/src/scripts/12patch.sh b/src/scripts/12patch.sh index 7f07241..326ba4a 100644 --- a/src/scripts/12patch.sh +++ b/src/scripts/12patch.sh @@ -35,7 +35,7 @@ Patch_runlevel () case "${1}" in apply) # Create init policy - echo > "${LIVE_CHROOT}"/usr/sbin/policy-rc.d < "${LIVE_CHROOT}"/usr/sbin/policy-rc.d <> "${LIVE_CHROOT}"/etc/apt/apt.conf fi + # Configure recommends + if [ "${LIVE_RECOMMENDS}" = "yes" ] + then + echo "Aptitude::Recommends-Important \"true\";" >> "${LIVE_CHROOT}"/etc/apt/apt.conf + else + echo "Aptitude::Recommends-Important \"false\";" >> "${LIVE_CHROOT}"/etc/apt/apt.conf + fi + # Save host lookup table if [ -f "${LIVE_CHROOT}"/etc/hosts ] then diff --git a/src/scripts/14chroot.sh b/src/scripts/14chroot.sh index 45d214d..2e2b489 100644 --- a/src/scripts/14chroot.sh +++ b/src/scripts/14chroot.sh @@ -31,14 +31,18 @@ Chroot () mount proc-live -t proc "${LIVE_CHROOT}"/proc # Configure sources.list - Indices custom + Indices custom initial + + # Install aptitude + Chroot_exec "apt-get install --yes --force-yes aptitude" # Install secure apt - if [ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ] || [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ] + if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ] || \ + [ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ] then if [ "${LIVE_FLAVOUR}" != "minimal" ] then - Chroot_exec "apt-get install --yes --force-yes debian-archive-keyring" + Chroot_exec "aptitude install --assume-yes debian-archive-keyring" for NAME in ${LIVE_REPOSITORIES} do @@ -47,7 +51,7 @@ Chroot () if [ -n "${REPOSITORY_KEYRING}" ] then - Chroot_exec "apt-get install ${REPOSITORY_KEYRING}" + Chroot_exec "aptiude install ${REPOSITORY_KEYRING}" elif [ -n "${REPOSITORY_KEY}" ] then Chroot_exec "wget ${REPOSITORY_KEY}" @@ -59,13 +63,13 @@ Chroot () fi # Update indices - Chroot_exec "apt-get update" + Chroot_exec "aptitude update" # Configure linux-image Patch_linux apply # Install linux-image, modules and casper - Chroot_exec "apt-get install --yes --force-yes ${LIVE_KERNEL_PACKAGES} casper" + Chroot_exec "aptitude install --assume-yes ${LIVE_KERNEL_PACKAGES} casper" # Deconfigure linux-image Patch_linux deapply @@ -78,7 +82,7 @@ Chroot () LIVE_CHROOT="${LIVE_CLONE}" # Extract debconf settings - Chroot_exec "apt-get install --yes debconf-utils" + Chroot_exec "aptitude install --assume-yes debconf-utils" Chroot_exec "debconf-get-selections" > "${LIVE_ROOT}"/preseed.cloned # Extract package selection @@ -95,7 +99,7 @@ Chroot () # Restore preseed configuration if [ -f "${LIVE_PRESEED}" ] then - Chroot_exec "apt-get install --yes --force-yes debconf-utils" + Chroot_exec "aptitude install --assume-yes debconf-utils" cp "${LIVE_PRESEED}" "${LIVE_CHROOT}"/root/preseed Chroot_exec "debconf-set-selections /root/preseed" rm -f "${LIVE_CHROOT}"/root/preseed @@ -109,21 +113,21 @@ Chroot () # Restore cloned package selection if [ -f "${LIVE_PACAKGE_LIST_CLONED}" ] then - Chroot_exec "xargs --arg-file=/root/`basename ${LIVE_PACKAGE_LIST_CLONED}` apt-get install --yes --force-yes" + Chroot_exec "xargs --arg-file=/root/`basename ${LIVE_PACKAGE_LIST_CLONED}` aptitude install --assume-yes" fi # Install packages list if [ -n "${LIVE_PACKAGE_LIST}" ] then grep -v "^#" "${LIVE_PACKAGE_LIST}" > "${LIVE_CHROOT}"/root/"`basename ${LIVE_PACKAGE_LIST}`" - Chroot_exec "xargs --arg-file=/root/`basename ${LIVE_PACKAGE_LIST}` apt-get install --yes --force-yes" + Chroot_exec "xargs --arg-file=/root/`basename ${LIVE_PACKAGE_LIST}` aptitude install --assume-yes" rm -f "${LIVE_CHROOT}"/root/"`basename ${LIVE_PACKAGE_LIST}`" fi # Install extra packages if [ -n "${LIVE_PACKAGES}" ] then - Chroot_exec "apt-get install --yes --force-yes ${LIVE_PACKAGES}" + Chroot_exec "aptitude install --assume-yes ${LIVE_PACKAGES}" fi # Copy external directory into the chroot @@ -160,7 +164,7 @@ Chroot () if [ ! -z "${LIVE_MANIFEST}" ] then - Chroot_exec "apt-get install --yes --force-yes ${LIVE_MANIFEST}" + Chroot_exec "aptitude install --assume-yes ${LIVE_MANIFEST}" Chroot_exec "dpkg-query -W \*" | awk '$2 ~ /./ {print $1 " " $2 }' > "${LIVE_ROOT}"/filesystem.manifest-desktop fi diff --git a/src/scripts/21image.sh b/src/scripts/21image.sh index 57c3d9f..0c8ab67 100644 --- a/src/scripts/21image.sh +++ b/src/scripts/21image.sh @@ -119,14 +119,19 @@ EOF done # Update indices - Chroot_exec "apt-get update" + if [ "${2}" = "initial" ] + then + Chroot_exec "apt-get update" + else + Chroot_exec "aptitude update" + fi if [ "${LIVE_DISTRIBUTION_EXPERIMENTAL}" = "yes" ] then # experimental is sometimes broken, # therefore this is intentionally kept interactive. - Chroot_exec "apt-get upgrade" || return 0 - Chroot_exec "apt-get dist-upgrade" || return 0 + Chroot_exec "aptitude upgrade" || return 0 + Chroot_exec "aptitude dist-upgrade" || return 0 fi } @@ -163,7 +168,7 @@ Syslinux () then # Install syslinux Patch_network apply - Chroot_exec "apt-get install --yes --force-yes syslinux" + Chroot_exec "aptitude install --assume-yes syslinux" case "${1}" in iso) @@ -203,7 +208,7 @@ Syslinux () esac # Remove syslinux - Chroot_exec "apt-get remove --purge --yes syslinux" + Chroot_exec "aptitude purge --assume-yes syslinux" Patch_network deapply fi } @@ -244,7 +249,7 @@ Memtest () then # Install memtest Patch_network apply - Chroot_exec "apt-get install --yes --force-yes memtest86+" + Chroot_exec "aptitude install --assume-yes memtest86+" case "$1" in iso) @@ -259,7 +264,7 @@ Memtest () esac # Remove memtest - Chroot_exec "apt-get remove --purge --yes memtest86+" + Chroot_exec "aptitude purge --assume-yes memtest86+" Patch_network deapply fi } diff --git a/src/scripts/23net.sh b/src/scripts/23net.sh index 3f973e0..48f5926 100644 --- a/src/scripts/23net.sh +++ b/src/scripts/23net.sh @@ -34,7 +34,7 @@ Net () mount proc-live -t proc "${LIVE_CHROOT}"/proc # Installing smbfs - Chroot_exec "apt-get install --yes --force-yes smbfs" + Chroot_exec "aptitude install --assume-yes smbfs" # Unmount proc umount "${LIVE_CHROOT}"/proc -- cgit v1.0