Commit 57cf927e authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Adding live-package 0.99.1-1.

parent eeaafbe5
2006-07-19 Daniel Baumann <daniel@debian.org>
* Bugfixes.
2006-07-18 Daniel Baumann <daniel@debian.org>
* Added iso templates.
......
live-package (0.99.1-1) unstable; urgency=low
* New upstream release.
-- Daniel Baumann <daniel@debian.org> Mon, 24 Jul 2006 00:00:00 +0200
live-package (0.99-1) unstable; urgency=low
* Initial release.
......
......@@ -24,6 +24,7 @@ make-live \- An utility for building Debian Live systems.
.IR FILE \||\| DIRECTORY \|]
.RB [\| \-\-include\-rootfs
.IR FILE \||\| DIRECTORY \|]
.BR [\| \-\-interactive \|]
.RB [\| \-\-linux\-image
.IR FLAVOUR \|]
.RB [\| \-\-logfile
......@@ -111,6 +112,9 @@ set through LIVE_INCLUDE_IMAGE environment variable.
specifies a file or directory which will be copied inside the root filesystem of
the image. Can be also set through the LIVE_INCLUDE_ROOTFS environment variable.
.TP
.BI \-\-interactive
lets you interactively customize the package selection.
.TP
.BI "\-\-linux\-image " FLAVOUR
.TP
.BI "\-p, \-\-package-list " FILE
......
......@@ -51,7 +51,7 @@ Help ()
{
echo "make-live - An utility for building Debian Live systems."
echo
echo "Usage: ${PROGRAM} [-a ARCHITECTURE] [-c FILE] [--clone DIRECTORY] [-d DISTRIBUTION] [--debug] [-f FILESYSTEM] [--flavour FLAVOUR] [--hook \"COMMAND...\"] [--include-image FILE|DIRECTORY] [--include-rootfs FILE|DIRECTORY] [--linux-image FLAVOUR] [--logfile FILE] [-p|--package-list FILE] [--preseed FILE] [--rootfs DIRECTORY] [-s|--section \"SECTION...\"] [--splashy [THEME]] [-t|--type TYPE] [--templates DIRECTORY] [--verbose] [LIST]"
echo "Usage: ${PROGRAM} [-a ARCHITECTURE] [-c FILE] [--clone DIRECTORY] [-d DISTRIBUTION] [--debug] [-f FILESYSTEM] [--flavour FLAVOUR] [--hook \"COMMAND...\"] [--include-image FILE|DIRECTORY] [--include-rootfs FILE|DIRECTORY] [--interactive] [--linux-image FLAVOUR] [--logfile FILE] [-p|--package-list FILE] [--preseed FILE] [--rootfs DIRECTORY] [-s|--section \"SECTION...\"] [--splashy [THEME]] [-t|--type TYPE] [--templates DIRECTORY] [--verbose] [LIST]"
echo
echo "Values:"
echo " Architectures: alpha, amd64, arm, hppa, i386, ia64, m68k, powerpc, s390, sparc."
......@@ -110,7 +110,7 @@ Main ()
{
ARGUMENTS=`getopt --shell=sh --name="${PROGRAM}" \
--options="a:c:d:f:p:s:t:huv" \
--longoptions="architecture:,conffile:,clone:,distribution:,debug,filesystem:,flavour:,hook:,include-image:,include-rootfs:,linux-image:,logfile:,package-list:,preseed:,rootfs:,section:,splashy::,type:,templates:,verbose" \
--longoptions="architecture:,conffile:,clone:,distribution:,debug,filesystem:,flavour:,hook:,include-image:,include-rootfs:,interactive,linux-image:,logfile:,package-list:,preseed:,rootfs:,section:,splashy::,type:,templates:,verbose,help,usage,version" \
-- "${@}"`
if [ "${?}" != "0" ]
......@@ -165,6 +165,10 @@ Main ()
LIVE_INCLUDE_ROOTFS="${2}"; shift 2
;;
--interactive)
LIVE_INTERACTIVE="1"; shift
;;
--linux-image)
LIVE_LINUX="${2}"; shift 2
;;
......
......@@ -96,7 +96,35 @@ Chroot ()
rm ${LIVE_CHROOT}/tmp/preseed
fi
# Add splashy and conditionally a theme
if [ ! -z "${LIVE_SPLASHY}" ]
then
chroots "apt-get install --yes splashy splashy-themes"
if [ ! -z "${LIVE_SPLASHY_THEME}" ]
then
# not already installed ? Then its a new theme to install!
if [ ! -d "${LIVE_CHROOT}"/etc/splashy/themes/"${LIVE_SPLASHY_THEME}" ]
then
if [ -f "${LIVE_SPLASHY_THEME}".tar.gz ]
then
cp "${LIVE_SPLASHY_THEME}".tar.gz "${LIVE_CHROOT}"/tmp/"${LIVE_SPLASHY_THEME}".tar.gz # this permits simlink to theme
chroots "splashy_config -i /tmp/${LIVE_SPLASHY_THEME}.tar.gz"
rm "${LIVE_CHROOT}"/tmp/"${LIVE_SPLASHY_THEME}".tar.gz
chroots "splashy_config -s ${LIVE_SPLASHY_THEME}"
else
echo "Specify the local splashy theme without extension, it also must be in the cwd"
fi
else
chroots "splashy_config -s ${LIVE_SPLASHY_THEME}"
fi
fi
fi
# --- End FIXME ---
if [ -z "${LIVE_ROOTFS}" ]
then
if [ -z "${lIVE_INTERACTIVE}" ]
then
# Install packages list
if [ ! -z "${LIVE_PACKAGE_LIST}" ]
......@@ -109,9 +137,14 @@ Chroot ()
then
chroots "apt-get install --yes ${LIVE_PACKAGES}"
fi
else
# Run aptitude
chroots "apt-get install --yes aptitude"
chroots "aptitude"
fi
fi
# Copy external path into the chroot
# Copy external directory into the chroot
if [ -d "${LIVE_INCLUDE_ROOTFS}" ]
then
cd "${LIVE_INCLUDE_ROOTFS}"
......@@ -125,32 +158,6 @@ Chroot ()
chroots "${LIVE_HOOK}"
fi
# Add splashy and conditionally a theme
if [ ! -z "${LIVE_SPLASHY}" ]
then
chroots "apt-get install --yes splashy splashy-themes"
if [ ! -z "${LIVE_SPLASHY_THEME}" ]
then
# not already installed ? Then its a new theme to install!
if [ ! -d "${LIVE_CHROOT}"/etc/splashy/themes/"${LIVE_SPLASHY_THEME}" ]
then
if [ -f "${LIVE_SPLASHY_THEME}".tar.gz ]
then
cp "${LIVE_SPLASHY_THEME}".tar.gz "${LIVE_CHROOT}"/tmp/"${LIVE_SPLASHY_THEME}".tar.gz # this permits simlink to theme
chroots "splashy_config -i /tmp/${LIVE_SPLASHY_THEME}.tar.gz"
rm "${LIVE_CHROOT}"/tmp/"${LIVE_SPLASHY_THEME}".tar.gz
chroots "splashy_config -s ${LIVE_SPLASHY_THEME}"
else
echo "Specify the local splashy theme without extension, it also must be in the cwd"
fi
else
chroots "splashy_config -s ${LIVE_SPLASHY_THEME}"
fi
fi
fi
# --- End FIXME ---
# Clean apt packages cache
rm -f "${LIVE_CHROOT}"/var/cache/apt/archives/*.deb
rm -f "${LIVE_CHROOT}"/var/cache/apt/archives/partial/*.deb
......
......@@ -7,8 +7,10 @@ Net ()
if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
then
mkdir "${LIVE_CHROOT}"/etc/mkinitramfs
# Configuring initramfs for NFS
cat >> "${LIVE_ROOT}"/chroot/etc/mkinitramfs/initramfs.conf << EOF
cat >> "${LIVE_CHROOT}"/etc/mkinitramfs/initramfs.conf << EOF
MODULES=netboot
BOOT=nfs
EOF
......@@ -27,12 +29,12 @@ EOF
then
# Creating tarball
cd "${LIVE_ROOT}" && cd .. && \
tar cfz netboot.tar.gz "${LIVE_ROOT}" && \
tar cfz netboot.tar.gz `basename "${LIVE_ROOT}"` && \
mv netboot.tar.gz "${LIVE_ROOT}"
else
# Creating tarball (debug)
cd "${LIVE_ROOT}" && cd .. && \
tar cfvz netboot.tar.gz "${LIVE_ROOT}" && \
tar cfvz netboot.tar.gz `basename "${LIVE_ROOT}"` && \
mv netboot.tar.gz "${LIVE_ROOT}"
fi
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment