Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-10 04:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use SUBPROJECT=minimized name instead of SUBPROJECT=minimize for consistency

Browse Source
This commit is contained in:
Balint Reczey 2017-10-03 17:31:26 +02:00
parent b90b04a7b7
commit 88d854ffb5
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
live-build/auto/build
View File

@ -31,14 +31,14 @@ Expire-Date: 0
lb bootstrap "$@"
if [ "$SUBPROJECT" = minimize ] \
if [ "$SUBPROJECT" = minimized ] \
&& ! Chroot chroot dpkg -l tzdata 2>&1 |grep -q ^ii; then
# workaround for tzdata purge not removing these files
rm -f chroot/etc/localtime chroot/etc/timezone
fi
if [ "$SUBPROJECT" = minimize ]; then
# set up dpkg filters to skip installing docs on minimized system
if [ "$SUBPROJECT" = minimized ]; then
# set up dpkg filters to skip installing docs on minimizedd system
mkdir -p chroot/etc/dpkg/dpkg.cfg.d
cat > chroot/etc/dpkg/dpkg.cfg.d/excludes <<EOF
# Drop all man pages

4
live-build/auto/config
View File

@ -196,7 +196,7 @@ HWE_X_PACKAGES="xserver-xorg-hwe-16.04 xserver-xorg-video-all-hwe-16.04 xserver-
HWE_KERNEL_FLAVOUR="generic-hwe-16.04"
HWE_SIGNED_KERNEL_PACKAGE="linux-signed-$HWE_KERNEL_FLAVOUR"
if [ "$SUBPROJECT" = minimize ]; then
if [ "$SUBPROJECT" = minimized ]; then
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
fi
@ -499,7 +499,7 @@ case $PROJECT in
;;
ubuntu-cpc)
if [ "$SUBPROJECT" = minimize ]; then
if [ "$SUBPROJECT" = minimized ]; then
add_task install cloud-image
add_package install sudo
else

2
live-build/ubuntu-cpc/hooks/032-disk-image.binary
View File

@ -116,7 +116,7 @@ if [ "${should_install_grub}" -eq 1 ]; then
rm mountpoint/tmp/device.map
if [ "$SUBPROJECT" = minimize ] && [ -n "$partuuid" ]; then
if [ "$SUBPROJECT" = minimized ] && [ -n "$partuuid" ]; then
echo "partuuid found for root device; forcing it in Grub"
mkdir -p mountpoint/etc/default/grub.d
echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid

2
live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
View File

@ -61,7 +61,7 @@ install_grub() {
efi_boot_dir="/boot/efi/EFI/BOOT"
chroot mountpoint mkdir -p "${efi_boot_dir}"
if [ "${SUBPROJECT:-}" = minimize ] && [ -n "$partuuid" ]; then
if [ "${SUBPROJECT:-}" = minimized ] && [ -n "$partuuid" ]; then
# FIXME: code duplicated between 032-disk-image.binary
# and 033-disk-image-uefi.binary. We want to fix this to not
# have initramfs-tools installed at all on these images.

2
live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
View File

@ -89,7 +89,7 @@ _xchroot "${rootd}" sh -c 'sed -i "/^127.0.1.1/d" /etc/hosts'
_xchroot "${rootd}" sh -c 'rm -f /etc/ssh/ssh_host_[rd]sa_key*'
## --------------
if [ "${SUBPROJECT:-}" != minimize ]; then
if [ "${SUBPROJECT:-}" != minimized ]; then
_xchroot "${rootd}" locale-gen en_US.utf8
fi