Adding live-package 0.99.4-1.
This commit is contained in:
Daniel Baumann
parent
fb35af8aa2
commit
c9462fd48b
1
AUTHORS
1
AUTHORS
|
|
@ -5,5 +5,6 @@ Main Authors:
|
|||
|
||||
Patches (alphabetical order):
|
||||
|
||||
* Alex Owen <r.a.owen@qmul.ac.uk>
|
||||
* Frederic Lehobey <Frederic.Lehobey@free.fr>
|
||||
* Jason D. Clinton <me@jasonclinton.com>
|
||||
|
|
|
|||
34
ChangeLog
34
ChangeLog
|
|
@ -1,3 +1,37 @@
|
|||
2006-08-31 Daniel Baumann <daniel@debian.org>
|
||||
|
||||
* Setting default sources.list while the image generation, restoring
|
||||
customized ones afterwards.
|
||||
|
||||
2006-08-30 Daniel Baumann <daniel@debian.org>
|
||||
|
||||
* Cleanups:
|
||||
- moved 14patch_packages.sh to 13hack.sh.
|
||||
- simplified 13hack.sh.
|
||||
|
||||
2006-08-29 Marco Amadori <marco.amadori@gmail.com>
|
||||
|
||||
* pxelinux.cfg: Updated to right defaults, first cifs then nfs or
|
||||
select your favorite way. Rationale: /dev/nfs is for kernel
|
||||
discovering, not for initramfs discover, casper will be just fine
|
||||
with "netboot".
|
||||
* 13chroot.sh, 14patch_packages.sh: Added a simple system for patching
|
||||
packages, mainly for xserver-xorg so far.
|
||||
|
||||
2006-08-28 Daniel Baumann <daniel@debian.org>
|
||||
|
||||
* Updated documentation.
|
||||
* Added patch from Alex Owen <r.a.owen@qmul.ac.uk> to update
|
||||
pxelinux.cfg for NFS root in casper.
|
||||
|
||||
2006-08-27 Daniel Baumann <daniel@debian.org>
|
||||
|
||||
* Cleanups.
|
||||
|
||||
2006-08-27 Marco Amadori <marco.amadori@gmail.com>
|
||||
|
||||
* Added sysv init blocking policy.
|
||||
|
||||
2006-08-22 Daniel Baumann <daniel@debian.org>
|
||||
|
||||
* Reorganised sources.
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -23,7 +23,7 @@ install:
|
|||
|
||||
@# Install manpages
|
||||
install -d -m 0755 $(DESTDIR)/usr/share/man/man8
|
||||
install -m 0644 doc/*.8 $(DESTDIR)/usr/share/man/man8
|
||||
install -m 0644 doc/man/*.8 $(DESTDIR)/usr/share/man/man8
|
||||
|
||||
uninstall:
|
||||
# Uninstalling make-live
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
Debian Live Framework: make-live
|
||||
================================
|
||||
|
||||
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.
|
||||
|
||||
More information about Debian Live can be found at <http://live.debian.net/>.
|
||||
|
|
@ -1,3 +1,13 @@
|
|||
live-package (0.99.4-1) unstable; urgency=low
|
||||
|
||||
* New upstream release:
|
||||
- Added patch from Alex Owen <r.a.owen@qmul.ac.uk> to update pxelinux.cfg
|
||||
for NFS root in casper (Closes: #380512).
|
||||
- Temporarily hacks xorg configuration file to remove BusID and set
|
||||
default driver to vesa (Closes: #382391).
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Mon, 28 Aug 2006 00:00:00 +0200
|
||||
|
||||
live-package (0.99.3-1) unstable; urgency=low
|
||||
|
||||
* New upstream release:
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
Source: live-package
|
||||
Section: misc
|
||||
Priority: optional
|
||||
Maintainer: Daniel Baumann <daniel@debian.org>
|
||||
Uploaders: Marco Amadori <marco.amadori@gmail.com>
|
||||
Maintainer: Debian Live <debian-live-devel@lists.alioth.debian.org>
|
||||
Uploaders: Daniel Baumann <daniel@debian.org>, Marco Amadori <marco.amadori@gmail.com>
|
||||
Build-Depends: debhelper (>= 4)
|
||||
Standards-Version: 3.7.2
|
||||
|
||||
|
|
@ -11,8 +11,9 @@ Architecture: all
|
|||
Depends: cdebootstrap (>= 0.3.10), dpkg-dev, genext2fs, mkisofs, squashfs-tools
|
||||
Provides: make-live
|
||||
Description: utility to build Debian Live systems
|
||||
The Debian Live framework provides all necessary tools to create Debian Live
|
||||
systems. make-live is the utility used to automagically build CD/DVD images and
|
||||
netboot tarballs.
|
||||
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.
|
||||
.
|
||||
Homepage: <http://live.debian.net/>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.TH MAKE-LIVE 8 "Mon, 22 Aug 2006" "0.99.3" "Debian Live framework"
|
||||
.TH MAKE-LIVE 8 "Mon, 28 Aug 2006" "0.99.4" "Debian Live framework"
|
||||
|
||||
.SH NAME
|
||||
make-live \- utility to build Debian Live systems
|
||||
|
|
@ -63,7 +63,7 @@ make-live \- utility to build Debian Live systems
|
|||
.RB \-v \||\| \-\-version
|
||||
|
||||
.SH DESCRIPTION
|
||||
The Debian Live framework provides all necessary tools to create Debian Live systems. make-live is the utility used to automagically build CD/DVD images and netboot tarballs.
|
||||
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
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
.TH MAKE-LIVE.CONF 8 "Mon, 22 Aug 2006" "0.99.3" "Debian Live framework"
|
||||
.TH MAKE-LIVE.CONF 8 "Mon, 28 Aug 2006" "0.99.4" "Debian Live framework"
|
||||
|
||||
.SH NAME
|
||||
make-live.conf \- configuration file for make-live(8)
|
||||
|
||||
.SH DESCRIPTION
|
||||
The Debian Live framework provides all necessary tools to create Debian Live systems. make-live is the utility used to automagically build CD/DVD images and netboot tarballs.
|
||||
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
|
||||
|
|
@ -42,11 +42,11 @@
|
|||
# Kernel flavour (Default: auto-detected)
|
||||
#LIVE_KERNEL=""
|
||||
|
||||
# Debian mirror (Default: http://ftp.debian.org/debian)
|
||||
#LIVE_MIRROR="http://ftp.debian.org/debian"
|
||||
# Debian mirror (Default: http://ftp.debian.org/debian/)
|
||||
#LIVE_MIRROR="http://ftp.debian.org/debian/"
|
||||
|
||||
# Debian security mirror (Default: http://security.debian.org/debian)
|
||||
#LIVE_MIRROR_SECURITY="http://ftp.debian.org/debian-security"
|
||||
# Debian security mirror (Default: http://security.debian.org/)
|
||||
#LIVE_MIRROR_SECURITY="http://security.debian.org/"
|
||||
|
||||
# Packages (Default: empty)
|
||||
LIVE_PACKAGES="cdebootstrap less locales screen sudo vim"
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ set -e
|
|||
BASE="/usr/share/make-live"
|
||||
CONFIG="/etc/make-live.conf"
|
||||
PROGRAM="`basename ${0}`"
|
||||
VERSION="0.99.3"
|
||||
VERSION="0.99.4"
|
||||
|
||||
CODENAME_OLDSTABLE="woody"
|
||||
CODENAME_STABLE="sarge"
|
||||
|
|
|
|||
|
|
@ -136,13 +136,13 @@ Defaults ()
|
|||
# Set debian mirror
|
||||
if [ -z "${LIVE_MIRROR}" ]
|
||||
then
|
||||
LIVE_MIRROR="http://ftp.debian.org/debian"
|
||||
LIVE_MIRROR="http://ftp.debian.org/debian/"
|
||||
fi
|
||||
|
||||
# Set debian security mirror
|
||||
if [ -z "${LIVE_MIRROR_SECURITY}" ]
|
||||
then
|
||||
LIVE_MIRROR_SECURITY="http://security.debian.org/debian"
|
||||
LIVE_MIRROR_SECURITY="http://security.debian.org/"
|
||||
fi
|
||||
|
||||
# Set debian sections
|
||||
|
|
|
|||
|
|
@ -27,6 +27,30 @@ Patch_chroot ()
|
|||
esac
|
||||
}
|
||||
|
||||
Patch_runlevel ()
|
||||
{
|
||||
# Disabling all init scripts with a blocking policy as in
|
||||
# /usr/share/doc/sysv-rc/README.policy-rc.d.gz.
|
||||
|
||||
case "${1}" in
|
||||
apply)
|
||||
# Create init policy
|
||||
echo > "${LIVE_CHROOT}"/usr/sbin/policy-rc.d <<EOF
|
||||
#!/bin/sh
|
||||
|
||||
exit 101
|
||||
EOF
|
||||
|
||||
chmod 0755 "${LIVE_CHROOT}"/usr/sbin/policy-rc.d
|
||||
;;
|
||||
|
||||
deapply)
|
||||
# Removing init policy
|
||||
rm -f "${LIVE_CHROOT}"/usr/sbin/policy-rc.d
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
Patch_network ()
|
||||
{
|
||||
# Packages which are manually installed inside the chroot are installed
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
#!/bin/sh
|
||||
|
||||
# make-live - utility to build Debian Live systems
|
||||
#
|
||||
# Copyright (C) 2006 Daniel Baumann <daniel@debian.org>
|
||||
# Copyright (C) 2006 Marco Amadori <marco.amadori@gmail.com>
|
||||
#
|
||||
# make-live comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
|
||||
# This is free software, and you are welcome to redistribute it
|
||||
# under certain conditions; see COPYING for details.
|
||||
|
||||
Hack_xorg ()
|
||||
{
|
||||
if [ -f "${LIVE_CHROOT}/etc/X11/xorg.conf" ]
|
||||
then
|
||||
# Comment "BusID" line and set driver to "vesa"
|
||||
sed -i -e 's/\(^.*BusID.*\)/#\1/g' -e '/Section "Device"/,/EndSection/ s/\(.*Driver.*"\).*\(".*\)/\1vesa\2/g' "${LIVE_CHROOT}"/etc/X11/xorg.conf
|
||||
fi
|
||||
}
|
||||
|
|
@ -21,29 +21,13 @@ Chroot ()
|
|||
then
|
||||
# Configure chroot
|
||||
Patch_chroot apply
|
||||
#Patch_runlevel apply
|
||||
|
||||
# Configure network
|
||||
Patch_network apply
|
||||
|
||||
# Configure sources.list
|
||||
echo "deb ${LIVE_MIRROR} ${LIVE_DISTRIBUTION} ${LIVE_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list
|
||||
|
||||
case "${LIVE_DISTRIBUTION}" in
|
||||
"${CODENAME_TESTING}")
|
||||
echo "deb ${LIVE_MIRROR} ${CODENAME_TESTING}-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
|
||||
echo "deb ${LIVE_MIRROR_SECURITY} ${CODENAME_TESTING}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
|
||||
;;
|
||||
|
||||
"${CODENAME_STABLE}")
|
||||
echo "deb ${LIVE_MIRROR_SECURITY} ${CODENAME_STABLE}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
|
||||
;;
|
||||
|
||||
"${CODENAME_OLDSTABLE}")
|
||||
echo "deb ${LIVE_MIRROR_SECURITY} ${CODENAME_OLDSTABLE}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
|
||||
;;
|
||||
esac
|
||||
|
||||
Chroot_exec "apt-get update"
|
||||
Indices custom
|
||||
|
||||
# Install secure apt
|
||||
if [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ]
|
||||
|
|
@ -92,6 +76,9 @@ Chroot ()
|
|||
Chroot_exec "${LIVE_HOOK}"
|
||||
fi
|
||||
|
||||
# Temporary hacks for broken packages
|
||||
Hack_xorg
|
||||
|
||||
# Clean apt packages cache
|
||||
rm -f "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb
|
||||
rm -f "${LIVE_CHROOT}"/var/cache/apt/archives/partial/*.deb
|
||||
|
|
@ -106,6 +93,7 @@ Chroot ()
|
|||
Patch_network deapply
|
||||
|
||||
# Deconfigure chroot
|
||||
#Patch_runlevel deapply
|
||||
Patch_chroot deapply
|
||||
|
||||
# Touching stage file
|
||||
|
|
@ -9,6 +9,54 @@
|
|||
# This is free software, and you are welcome to redistribute it
|
||||
# under certain conditions; see COPYING for details.
|
||||
|
||||
Indices ()
|
||||
{
|
||||
case "${1}" in
|
||||
default)
|
||||
# Configure default sources.list
|
||||
echo "deb http://ftp.debian.org/debian/ ${LIVE_DISTRIBUTION} ${LIVE_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list
|
||||
|
||||
case "${LIVE_DISTRIBUTION}" in
|
||||
"${CODENAME_TESTING}")
|
||||
echo "deb http://ftp.debian.org/debian/ ${CODENAME_TESTING}-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
|
||||
echo "deb http://security.debian.org/ ${CODENAME_TESTING}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
|
||||
;;
|
||||
|
||||
"${CODENAME_STABLE}")
|
||||
echo "deb ${LIVE_MIRROR_SECURITY} ${CODENAME_STABLE}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
|
||||
;;
|
||||
|
||||
"${CODENAME_OLDSTABLE}")
|
||||
echo "deb ${LIVE_MIRROR_SECURITY} ${CODENAME_OLDSTABLE}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
custom)
|
||||
# Configure custom sources.list
|
||||
echo "deb ${LIVE_MIRROR} ${LIVE_DISTRIBUTION} ${LIVE_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list
|
||||
|
||||
case "${LIVE_DISTRIBUTION}" in
|
||||
"${CODENAME_TESTING}")
|
||||
echo "deb ${LIVE_MIRROR} ${CODENAME_TESTING}-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
|
||||
echo "deb ${LIVE_MIRROR_SECURITY} ${CODENAME_TESTING}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
|
||||
;;
|
||||
|
||||
"${CODENAME_STABLE}")
|
||||
echo "deb ${LIVE_MIRROR_SECURITY} ${CODENAME_STABLE}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
|
||||
;;
|
||||
|
||||
"${CODENAME_OLDSTABLE}")
|
||||
echo "deb ${LIVE_MIRROR_SECURITY} ${CODENAME_OLDSTABLE}/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
||||
# Update indices
|
||||
Chroot_exec "apt-get update"
|
||||
}
|
||||
|
||||
Md5sum ()
|
||||
{
|
||||
# Calculating md5sums
|
||||
|
|
|
|||
|
|
@ -12,10 +12,16 @@
|
|||
Iso ()
|
||||
{
|
||||
mkdir -p "${LIVE_ROOT}"/image/casper
|
||||
|
||||
# Switching package indices to default
|
||||
Indices default
|
||||
|
||||
# Generating rootfs image
|
||||
Genrootfs
|
||||
|
||||
# Switching package indices to custom
|
||||
Indices custom
|
||||
|
||||
# Installing syslinux
|
||||
Syslinux iso
|
||||
|
||||
|
|
|
|||
|
|
@ -29,10 +29,16 @@ NFSROOT=auto
|
|||
EOF
|
||||
Chroot_exec "update-initramfs -tu"
|
||||
fi
|
||||
|
||||
# Switching package indices to default
|
||||
Indices default
|
||||
|
||||
# Generating rootfs
|
||||
# Generating rootfs image
|
||||
Genrootfs
|
||||
|
||||
# Switching package indices to custom
|
||||
Indices custom
|
||||
|
||||
# Installing syslinux
|
||||
Syslinux net
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,18 @@ default linux
|
|||
label linux
|
||||
kernel vmlinuz
|
||||
append initrd=initrd.gz boot=casper netboot nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
|
||||
label nfs
|
||||
kernel vmlinuz
|
||||
append initrd=initrd.gz boot=casper netboot=nfs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
|
||||
label nfslegacy
|
||||
kernel vmlinuz
|
||||
append initrd=initrd.gz boot=casper root=/dev/nfs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
|
||||
label cifs
|
||||
kernel vmlinuz
|
||||
append initrd=initrd.gz boot=casper netboot=cifs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
|
||||
label cifslegacy
|
||||
kernel vmlinuz
|
||||
append initrd=initrd.gz boot=casper root=/dev/cifs nfsroot=LIVE_SERVER_ADDRESS:LIVE_SERVER_PATH LIVE_BOOTAPPEND
|
||||
label memtest
|
||||
kernel memtest
|
||||
display isolinux.txt
|
||||
|
|
|
|||
Loading…
Reference in New Issue