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

Ship static files instead of generating in a hook

Browse Source 
When the files we're creating in the live layer have static content, ship
them in live-build/ubuntu/includes.chroot.minimal.standard.live instead of
generating them from live-build/ubuntu/hooks/020-ubuntu-live.chroot_early.

Also fixes the fact that
live-build/ubuntu/hooks/020-ubuntu-live.chroot_early was incorrectly writing
to /root in the previous upload instead of /usr.
This commit is contained in:
Steve Langasek 2023-12-20 11:34:13 -08:00
parent 915a6910fc
commit b45cad12b4
6 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
debian/changelog vendored
View File

@ -1,3 +1,14 @@
livecd-rootfs (24.04.14) UNRELEASED; urgency=medium
* When the files we're creating in the live layer have static content,
ship them in live-build/ubuntu/includes.chroot.minimal.standard.live
instead of generating them from
live-build/ubuntu/hooks/020-ubuntu-live.chroot_early. Also fixes the
fact that live-build/ubuntu/hooks/020-ubuntu-live.chroot_early was
incorrectly writing to /root in the previous upload instead of /usr.
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 20 Dec 2023 11:26:08 -0800
livecd-rootfs (24.04.13) noble; urgency=medium livecd-rootfs (24.04.13) noble; urgency=medium
* Drop support for building armhf+raspi images; as of noble these are * Drop support for building armhf+raspi images; as of noble these are

36
live-build/ubuntu/hooks/020-ubuntu-live.chroot_early
View File

@ -10,44 +10,8 @@ case ${PASS:-} in
;; ;;
esac esac
cat <<EOF > /etc/initramfs-tools/conf.d/casperize.conf
export CASPER_GENERATE_UUID=1
EOF
cat <<EOF > /etc/initramfs-tools/conf.d/default-layer.conf cat <<EOF > /etc/initramfs-tools/conf.d/default-layer.conf
LAYERFS_PATH=${PASS}.squashfs LAYERFS_PATH=${PASS}.squashfs
EOF EOF
# change settings to have an 'installer only' session by default
printf "[org.gnome.desktop.a11y]\nalways-show-universal-access-status=true\n" \
>> /usr/share/glib-2.0/schemas/casper.gschema.override
# we can't unload the dock because the shell would enter the overview on login;
# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1788
printf "[org.gnome.shell.extensions.dash-to-dock:ubuntu]\ndock-fixed=false\nintellihide=false\n" \
>> /root/usr/share/glib-2.0/schemas/casper.gschema.override
printf "[org.gnome.shell]\ndisabled-extensions=['ding@rastersoft.com']\n" \
>> /root/usr/share/glib-2.0/schemas/casper.gschema.override
glib-compile-schemas /usr/share/glib-2.0/schemas/ glib-compile-schemas /usr/share/glib-2.0/schemas/
# start the installer on session start, restore normal session on close
cat > /usr/lib/systemd/user/ubuntu-desktop-installer.service << EOF
[Unit]
Description=Ubuntu Desktop Installer
PartOf=graphical-session.target
After=graphical-session.target
# Never run in GDM
Conflicts=gnome-session@gnome-login.target
[Service]
Type=oneshot
ExecStart=/snap/bin/ubuntu-desktop-installer --try-or-install
ExecStopPost=sh -c "gsettings set org.gnome.shell.extensions.dash-to-dock dock-fixed true; gsettings set org.gnome.shell.extensions.dash-to-dock intellihide true; gnome-extensions enable ding@rastersoft.com"
Restart=no
EOF
mkdir /etc/systemd/user/graphical-session.target.wants/
ln -s /usr/lib/systemd/user/ubuntu-desktop-installer.service \
/etc/systemd/user/graphical-session.target.wants/

1
live-build/ubuntu/includes.chroot.minimal.standard.live/etc/initramfs-tools/conf.d/casperize.conf Normal file
View File

@ -0,0 +1 @@
export CASPER_GENERATE_UUID=1

1
live-build/ubuntu/includes.chroot.minimal.standard.live/etc/systemd/user/graphical-session.target.wants/ubuntu-desktop-installer.service Symbolic link
View File

@ -0,0 +1 @@
/usr/lib/systemd/user/ubuntu-desktop-installer.service

15
live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/user/ubuntu-desktop-installer.service Normal file
View File

@ -0,0 +1,15 @@
# start the installer on session start, restore normal session on close
[Unit]
Description=Ubuntu Desktop Installer
PartOf=graphical-session.target
After=graphical-session.target
# Never run in GDM
Conflicts=gnome-session@gnome-login.target
[Service]
Type=oneshot
ExecStart=/snap/bin/ubuntu-desktop-installer --try-or-install
ExecStopPost=sh -c "gsettings set org.gnome.shell.extensions.dash-to-dock dock-fixed true; gsettings set org.gnome.shell.extensions.dash-to-dock intellihide true; gnome-extensions enable ding@rastersoft.com"
Restart=no

12
live-build/ubuntu/includes.chroot.minimal.standard.live/usr/share/glib-2.0/schemas/casper.gschema.override Normal file
View File

@ -0,0 +1,12 @@
# change settings to have an 'installer only' session by default
[org.gnome.desktop.a11y]
always-show-universal-access-status=true
# we can't unload the dock because the shell would enter the overview on login;
# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1788
[org.gnome.shell.extensions.dash-to-dock:ubuntu]
dock-fixed=false
intellihide=false
[org.gnome.shell]
disabled-extensions=['ding@rastersoft.com']