lh_binary_debian-installer: Only create package pools when necessary
There is no need to create a package pool when creating a netboot Debian Live image or when the LH_DEBIAN_INSTALLER is set to "businesscard". Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
This commit is contained in:
parent
762613f277
commit
cf25064250
|
@ -229,7 +229,26 @@ then
|
||||||
wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz
|
wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then
|
# Only download additional packages if appropriate
|
||||||
|
case "${LH_DEBIAN_INSTALLER}" in
|
||||||
|
enabled|cdrom|netinst)
|
||||||
|
case "${LH_BINARY_IMAGES}" in
|
||||||
|
net)
|
||||||
|
DI_PACKAGE_POOL="no"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
DI_PACKAGE_POOL="yes"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
|
||||||
|
*)
|
||||||
|
DI_PACKAGE_POOL="no"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if [ "${DI_PACKAGE_POOL}" = "yes" ]
|
||||||
|
then
|
||||||
# Downloading additional packages
|
# Downloading additional packages
|
||||||
mkdir -p chroot/binary.deb/archives/partial
|
mkdir -p chroot/binary.deb/archives/partial
|
||||||
mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
|
mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
|
||||||
|
@ -262,7 +281,6 @@ if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then
|
||||||
Install_file "${FILE}" "binary/pool/main"
|
Install_file "${FILE}" "binary/pool/main"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
# Including base debian packages
|
# Including base debian packages
|
||||||
if [ -d cache/packages_bootstrap ]
|
if [ -d cache/packages_bootstrap ]
|
||||||
|
@ -353,6 +371,7 @@ then
|
||||||
rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb
|
rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Excluding udebs
|
# Excluding udebs
|
||||||
grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DISTRIBUTION}"/udeb_exclude > exclude
|
grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DISTRIBUTION}"/udeb_exclude > exclude
|
||||||
grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DISTRIBUTION}"/exclude-udebs >> exclude
|
grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DISTRIBUTION}"/exclude-udebs >> exclude
|
||||||
|
@ -430,6 +449,7 @@ if [ -e config/binary_debian-installer/preseed*.cfg ]
|
||||||
then
|
then
|
||||||
cp config/binary_debian-installer/preseed*.cfg binary/install
|
cp config/binary_debian-installer/preseed*.cfg binary/install
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Creating stage file
|
# Creating stage file
|
||||||
Create_stagefile .stage/binary_debian-installer
|
Create_stagefile .stage/binary_debian-installer
|
||||||
|
|
Loading…
Reference in New Issue