summaryrefslogtreecommitdiff
path: root/src/scripts/22iso.sh
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:04:40 +0200
committerDaniel Baumann <daniel@debian.org>2007-09-23 10:04:40 +0200
commit9a9491318d4a0469e4c97b28879ab34391c39095 (patch)
treeea026c746cb88285b5f04cf0211e2e034534e639 /src/scripts/22iso.sh
parentaf04c39b8b9a20d70e7123c57ec175e1b34d7d94 (diff)
downloadlive-build-9a9491318d4a0469e4c97b28879ab34391c39095.zip
live-build-9a9491318d4a0469e4c97b28879ab34391c39095.tar.gz
Adding live-package 0.99.21-1.
Diffstat (limited to 'src/scripts/22iso.sh')
-rw-r--r--src/scripts/22iso.sh34
1 files changed, 31 insertions, 3 deletions
diff --git a/src/scripts/22iso.sh b/src/scripts/22iso.sh
index 6f60a5f..c99b774 100644
--- a/src/scripts/22iso.sh
+++ b/src/scripts/22iso.sh
@@ -66,6 +66,20 @@ Iso ()
# Switching package indices to custom
Indices custom
+ # Install depends
+ if [ -z "${KEEP_MEMTEST86}" ]
+ then
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
+ then
+ Chroot_exec "aptitude install --assume-yes memtest86+"
+ fi
+ fi
+
+ if [ -z "${KEEP_SYSLINUX}" ]
+ then
+ Chroot_exec "aptitude install --assume-yes syslinux"
+ fi
+
# Installing syslinux
Syslinux iso
@@ -75,6 +89,20 @@ Iso ()
# Installing memtest
Memtest iso
+ # Remove depends
+ if [ -z "${KEEP_MEMTEST86}" ]
+ then
+ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
+ then
+ Chroot_exec "aptitude purge --assume-yes memtest86+"
+ fi
+ fi
+
+ if [ -z "${KEEP_SYSLINUX}" ]
+ then
+ Chroot_exec "aptitude purge --assume-yes syslinux"
+ fi
+
# Deconfigure network
Patch_network deapply
@@ -83,7 +111,7 @@ Iso ()
Patch_chroot deapply
# Installing templates
- if [ "${LIVE_FLAVOUR}" != "minimal" ]
+ if [ "${LIVE_FLAVOUR}" != "minimal" ] || [ "${LIVE_FLAVOUR}" != "mini" ]
then
cp -r "${LIVE_TEMPLATES}"/iso/* "${LIVE_ROOT}"/binary
cp -r "${LIVE_TEMPLATES}"/common/* "${LIVE_ROOT}"/binary
@@ -93,7 +121,7 @@ Iso ()
Md5sum
# Creating image
- Mkisofs binary
+ Genisoimage binary
# Touching stage file
touch "${LIVE_ROOT}"/.stage/image_binary
@@ -119,7 +147,7 @@ Iso ()
Patch_chroot deapply
# Creating image
- Mkisofs source
+ Genisoimage source
# Touching stage file
touch "${LIVE_ROOT}"/.stage/image_source