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

Imported 24.04.7 from noble-release pocket.

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2023-12-07 23:00:17 +00:00
parent d15bb0a591
commit c704051c30
5 changed files with 28 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
debian/changelog vendored
View File

@ -1,3 +1,23 @@
livecd-rootfs (24.04.7) noble; urgency=medium
[ Dave Jones ]
* Remove more bits related to pre-installed desktop images (LP: #2038098)
[ Jean-Baptiste Lallement ]
* Include -updates when calling germinate. LP: #1921862.
[ Dan Bungert ]
* cpc/vagrant: fix possible autopkgtest hang on ssh-keygen
[ Simon Poirier ]
* add systemd-resolved back to buildd images. LP: #2007419.
[ Steve Langasek ]
* live-build/functions: add additional debugging to mount_image() on
failure since we again have loop partitions failing to be block devices.
-- Steve Langasek <steve.langasek@ubuntu.com> Sun, 03 Dec 2023 21:38:27 -0800
livecd-rootfs (24.04.6) noble; urgency=medium
* Re-enable universe for pre-installed images (LP: #2044154)

7
live-build/auto/config
View File

@ -626,8 +626,8 @@ if ! [ -e config/germinate-output/structure ]; then
GERMINATE_ARG="-c $(echo $COMPONENTS | sed -e's/ \+/,/g')"
fi
(cd config/germinate-output && germinate --no-rdepends --no-installer \
-S $SEEDMIRROR -m $MIRROR -d $SUITE -s $FLAVOUR.$SUITE \
$GERMINATE_ARG -a $ARCH)
-S $SEEDMIRROR -m $MIRROR -d $SUITE,$SUITE-updates \
-s $FLAVOUR.$SUITE $GERMINATE_ARG -a $ARCH)
fi
case $PROJECT in
@ -1058,6 +1058,9 @@ case $SUBPROJECT in
add_package install build-essential
# Needed for LXD-based builds.
add_package install init
# Needed for bootable buildd systems which don't get injected
# nameserver configuration. (LP: 2007419)
add_package install systemd-resolved
# Not strictly build-essential, but traditionally present
# and a variety of things fail without it.
add_package install tzdata

1
live-build/functions
View File

@ -73,6 +73,7 @@ mount_image() {
rootfs_dev_mapper="${loop_device}p${rootpart}"
if [ ! -b "${rootfs_dev_mapper}" ]; then
echo "${rootfs_dev_mapper} is not a block device";
ls -l ${loop_device}p*
exit 1
fi

3
live-build/ubuntu-cpc/hooks.d/base/vagrant.binary
View File

@ -66,7 +66,8 @@ trap cleanup_vagrant EXIT
### https://github.com/hashicorp/vagrant/tree/main/keys
##########################
ssh-keygen -t ed25519 -C "ubuntu_vagrant_insecure_key" -b 4096 -f ${box_d}/vagrant_insecure_key
ssh-keygen -t ed25519 -C "ubuntu_vagrant_insecure_key" -b 4096 \
-f ${box_d}/vagrant_insecure_key -N ""
pub_key=$(cat ${box_d}/vagrant_insecure_key.pub)

54
live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot
View File

@ -1,54 +0,0 @@
#!/bin/bash -ex
. /root/config/chroot
# Specific ubuntu-image chroot configuration goes here.
if [ "$IMAGEFORMAT" == "none" ]; then
if [ "$SUBPROJECT" == "desktop-preinstalled" ]; then
# Create files/dirs Ubiquity requires
mkdir -p /var/log/installer
touch /var/log/installer/debug
touch /var/log/syslog
chown syslog:adm /var/log/syslog
# Create the oem user account only if it doesn't already exist
if ! id "oem" &>/dev/null; then
/usr/sbin/useradd -d /home/oem -G adm,sudo -m -N -u 29999 oem
/usr/sbin/oem-config-prepare --quiet
touch "/var/lib/oem-config/run"
fi
# Update the fstab to include the "discard" option
awk \
-v root_fs_label="writable" \
-v root_fs_options="discard" \
'
BEGIN { OFS="\t"; count=0; }
# Omit the "UNCONFIGURED" warning if it is still present
/^# UNCONFIGURED FSTAB/ { next; }
# Only modify the first non-comment line where the second field is the
# root and omit multiple root definitions
/^[^#]/ && $2 == "/" {
if (!count) {
$1="LABEL=" root_fs_label;
$4=root_fs_options;
$6="1";
}
count++;
if (count > 1) next;
}
{ print; }
# If we reach the end without seeing a root mount line, add one
END {
if (!count) {
print "LABEL=" root_fs_label, "/", "ext4", root_fs_options, "0", "1";
}
}
' /etc/fstab > /etc/fstab.new
mv /etc/fstab.new /etc/fstab
fi
fi