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

Some updates to the core-desktop builds.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2023-11-03 09:05:00 +02:00
parent 05f76cf24b
commit 30418f67ce
5 changed files with 64 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
live-build/auto/build
View File

@ -123,7 +123,7 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
cat install-sources-in.yaml | sed "s/@SIZE@/$(stat -c%s pc.img.xz)/g" > install-sources.yaml cat install-sources-in.yaml | sed "s/@SIZE@/$(stat -c%s pc.img.xz)/g" > install-sources.yaml
# Now move all of the payload to the image-definitions directory, # Now move all of the payload to the image-definitions directory,
# so that they can be used by the image-definition effectively. # so that they can be used by the image-definition effectively.
mv install-sources.yaml pc.img.xz autoinstall.yaml 99-custom-networking.cfg ../image-definitions/ mv install-sources.yaml pc.img.xz autoinstall.yaml 99-custom-networking.cfg casper* ../image-definitions/
cd ../ cd ../
# Also, since we care about the model assertion to be presented, # Also, since we care about the model assertion to be presented,

2
live-build/auto/config
View File

@ -518,7 +518,7 @@ case $IMAGEFORMAT in
# one for the payload and one for the actual image # one for the payload and one for the actual image
echo "Configuring for additional payload preparation" echo "Configuring for additional payload preparation"
UBUNTU_IMAGE_PAYLOAD_ARGS="--image-size 12G" UBUNTU_IMAGE_PAYLOAD_ARGS="--image-size 12G"
EXTRA_SNAPS="$EXTRA_SNAPS eog evince firefox gnome-calculator gnome-characters gnome-clocks gnome-font-viewer gnome-logs gnome-text-editor gnome-weather ubuntu-core-desktop-init" EXTRA_SNAPS="$EXTRA_SNAPS evince firefox gnome-calculator gnome-characters gnome-clocks gnome-font-viewer gnome-logs gnome-system-monitor gnome-text-editor gnome-weather loupe snapd-desktop-integration snap-store ubuntu-core-desktop-init workshops"
for snap in $EXTRA_SNAPS; do for snap in $EXTRA_SNAPS; do
UBUNTU_IMAGE_PAYLOAD_ARGS="$UBUNTU_IMAGE_PAYLOAD_ARGS --snap $snap" UBUNTU_IMAGE_PAYLOAD_ARGS="$UBUNTU_IMAGE_PAYLOAD_ARGS --snap $snap"
done done

3
live-build/ubuntu-core-desktop/casper-enable Executable file
View File

@ -0,0 +1,3 @@
#!/bin/sh
/usr/bin/systemctl enable casper

43
live-build/ubuntu-core-desktop/casper-stop Executable file
View File

@ -0,0 +1,43 @@
#!/bin/sh
# Author: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
# Tollef Fog Heen <tfheen@canonical.com>
# Marco Amadori <marco.amadori@gmail.com>
#
PATH=/usr/sbin:/usr/bin:/sbin:/bin
do_stop ()
{
prompt=1
if grep -qs noprompt /proc/cmdline || [ -e /run/casper-no-prompt ]; then
prompt=
fi
# XXX - i18n
MSG="Please press ENTER then remove the installation medium: "
MSG_FALLBACK="Please remove the installation medium, then reboot."
if [ "$prompt" ]; then
if [ -x /bin/plymouth ] && plymouth --ping; then
chvt 63
plymouth message --text="$MSG"
clear > /dev/tty1
echo $MSG_FALLBACK > /dev/tty1
else
stty sane < /dev/console
echo $MSG > /dev/console
fi
fi
[ "$prompt" ] || return 0
if [ -x /bin/plymouth ] && plymouth --ping; then
plymouth watch-keystroke > /dev/null
else
read x < /dev/console
fi
}
do_stop

16
live-build/ubuntu-core-desktop/casper.service Normal file
View File

@ -0,0 +1,16 @@
[Unit]
Description=Shuts down the "live" preinstalled system cleanly
DefaultDependencies=no
Before=final.target
After=shutdown.target umount.target plymouth-halt.service plymouth-poweroff.service plymouth-reboot.service
[Service]
Type=oneshot
ExecStart=/sbin/casper-stop
StandardInput=tty-force
StandardOutput=inherit
StandardError=inherit
TTYReset=yes
[Install]
WantedBy=final.target