summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:04:21 +0200
committerDaniel Baumann <daniel@debian.org>2007-09-23 10:04:21 +0200
commitc9462fd48b0d4fb9968641e46c3350fb5e9986a2 (patch)
treee14a49ee47996090c87a23c86d2e2c2ac877a70e
parentfb35af8aa207ef5377022028d9e2b497445fb349 (diff)
downloadvyos-live-build-c9462fd48b0d4fb9968641e46c3350fb5e9986a2.tar.gz
vyos-live-build-c9462fd48b0d4fb9968641e46c3350fb5e9986a2.zip
Adding live-package 0.99.4-1.
-rw-r--r--AUTHORS1
-rw-r--r--ChangeLog34
-rw-r--r--Makefile2
-rw-r--r--README8
-rw-r--r--debian/changelog10
-rw-r--r--debian/control11
-rw-r--r--doc/man/make-live.8 (renamed from doc/make-live.8)4
-rw-r--r--doc/man/make-live.conf.8 (renamed from doc/make-live.conf.8)4
-rw-r--r--src/config8
-rwxr-xr-xsrc/main.sh2
-rw-r--r--src/scripts/02defaults.sh4
-rw-r--r--src/scripts/12patch.sh24
-rw-r--r--src/scripts/13hack.sh19
-rw-r--r--src/scripts/14chroot.sh (renamed from src/scripts/13chroot.sh)24
-rw-r--r--src/scripts/21image.sh48
-rw-r--r--src/scripts/22iso.sh6
-rw-r--r--src/scripts/23net.sh8
-rw-r--r--templates/syslinux/pxelinux.cfg12
18 files changed, 193 insertions, 36 deletions
diff --git a/AUTHORS b/AUTHORS
index a74190c99..7e03b55d5 100644
--- a/AUTHORS
+++ b/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>
diff --git a/ChangeLog b/ChangeLog
index a7a74f0d2..af576636c 100644
--- a/ChangeLog
+++ b/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.
diff --git a/Makefile b/Makefile
index e43700a1d..a6976d238 100644
--- a/Makefile
+++ b/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
diff --git a/README b/README
new file mode 100644
index 000000000..dc3a615b8
--- /dev/null
+++ b/README
@@ -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/>.
diff --git a/debian/changelog b/debian/changelog
index 83d719cc3..467c34a41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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:
diff --git a/debian/control b/debian/control
index 57d0de73d..db9ea44ba 100644
--- a/debian/control
+++ b/debian/control
@@ -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/>
diff --git a/doc/make-live.8 b/doc/man/make-live.8
index a1496cd9d..d4585f04c 100644
--- a/doc/make-live.8
+++ b/doc/man/make-live.8
@@ -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
diff --git a/doc/make-live.conf.8 b/doc/man/make-live.conf.8
index 0a8aa9e8d..30b6bd3a4 100644
--- a/doc/make-live.conf.8
+++ b/doc/man/make-live.conf.8
@@ -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
diff --git a/src/config b/src/config
index b4f32b2e5..01b1c81c4 100644
--- a/src/config
+++ b/src/config
@@ -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"
diff --git a/src/main.sh b/src/main.sh
index 2d8fda95a..b0405e039 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.3"
+VERSION="0.99.4"
CODENAME_OLDSTABLE="woody"
CODENAME_STABLE="sarge"
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh
index 9a0342da3..99a8d3b4a 100644
--- a/src/scripts/02defaults.sh
+++ b/src/scripts/02defaults.sh
@@ -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
diff --git a/src/scripts/12patch.sh b/src/scripts/12patch.sh
index 16be344f1..873865c36 100644
--- a/src/scripts/12patch.sh
+++ b/src/scripts/12patch.sh
@@ -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
diff --git a/src/scripts/13hack.sh b/src/scripts/13hack.sh
new file mode 100644
index 000000000..74bb5adcd
--- /dev/null
+++ b/src/scripts/13hack.sh
@@ -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
+}
diff --git a/src/scripts/13chroot.sh b/src/scripts/14chroot.sh
index dd177dfb9..5f3ff9cd6 100644
--- a/src/scripts/13chroot.sh
+++ b/src/scripts/14chroot.sh
@@ -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
diff --git a/src/scripts/21image.sh b/src/scripts/21image.sh
index 51be0a106..0f483a6d3 100644
--- a/src/scripts/21image.sh
+++ b/src/scripts/21image.sh
@@ -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
diff --git a/src/scripts/22iso.sh b/src/scripts/22iso.sh
index bb67ef9b4..8f5b8c287 100644
--- a/src/scripts/22iso.sh
+++ b/src/scripts/22iso.sh
@@ -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
diff --git a/src/scripts/23net.sh b/src/scripts/23net.sh
index 816d05aa7..144118363 100644
--- a/src/scripts/23net.sh
+++ b/src/scripts/23net.sh
@@ -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
diff --git a/templates/syslinux/pxelinux.cfg b/templates/syslinux/pxelinux.cfg
index 41e1a672d..9a49d7dca 100644
--- a/templates/syslinux/pxelinux.cfg
+++ b/templates/syslinux/pxelinux.cfg
@@ -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