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

Merge lp:~rcj/livecd-rootfs/trunk

Browse Source
This commit is contained in:
Steve Langasek 2018-09-27 14:28:32 -07:00
commit a8e19c5675
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -2,6 +2,10 @@ livecd-rootfs (2.541) UNRELEASED; urgency=medium
* Remove device nodes from Docker images. (LP: #1645468) * Remove device nodes from Docker images. (LP: #1645468)
[ Robert C Jennings ]
* Add the server snap seed to the ubuntu-cpc project
* Allow hooks to replace generic snap assertion
-- Michael Hudson-Doyle <mwhudson@debian.org> Wed, 26 Sep 2018 12:43:23 +1200 -- Michael Hudson-Doyle <mwhudson@debian.org> Wed, 26 Sep 2018 12:43:23 +1200
livecd-rootfs (2.540) cosmic; urgency=medium livecd-rootfs (2.540) cosmic; urgency=medium

3
live-build/auto/config
View File

@ -696,6 +696,9 @@ case $PROJECT:${SUBPROJECT:-} in
ubuntu:*|kubuntu*:*|lubuntu*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*) ubuntu:*|kubuntu*:*|lubuntu*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*)
BASE_SEED='desktop' BASE_SEED='desktop'
;; ;;
ubuntu-cpc:*)
BASE_SEED='server'
;;
ubuntu-server:live) ubuntu-server:live)
BASE_SEED='server' BASE_SEED='server'
# subiquity is seeded but in a separate squashfs via hooks; set HOOK_SNAPS and ALL_SNAPS. # subiquity is seeded but in a separate squashfs via hooks; set HOOK_SNAPS and ALL_SNAPS.

18
live-build/functions
View File

@ -427,6 +427,16 @@ snap_prepare_assertions() {
local brand="$(echo $CUSTOM_BRAND_MODEL | cut -d: -f 1)" local brand="$(echo $CUSTOM_BRAND_MODEL | cut -d: -f 1)"
local model="$(echo $CUSTOM_BRAND_MODEL | cut -d: -f 2)" local model="$(echo $CUSTOM_BRAND_MODEL | cut -d: -f 2)"
# Clear the assertions if they already exist
if [ -e "$model_assertion" ] ; then
existing_model=$(awk '/^model: / {print $2}' $model_assertion)
existing_brand=$(awk '/^brand-id: / {print $2}' $model_assertion)
echo "snap_prepare_assertions: replacing $existing_brand:$existing_model with $brand:$model"
rm "$model_assertion"
rm "$account_key_assertion"
rm "$account_assertion"
fi
if ! [ -e "$model_assertion" ] ; then if ! [ -e "$model_assertion" ] ; then
snap known --remote model series=16 \ snap known --remote model series=16 \
model=$model brand-id=$brand \ model=$model brand-id=$brand \
@ -441,7 +451,6 @@ snap_prepare_assertions() {
> "$account_key_assertion" > "$account_key_assertion"
fi fi
if ! [ -e "$account_assertion" ] ; then if ! [ -e "$account_assertion" ] ; then
local account=$(sed -n -e's/account-id: //p' < "$account_key_assertion") local account=$(sed -n -e's/account-id: //p' < "$account_key_assertion")
snap known --remote account account-id=$account \ snap known --remote account account-id=$account \
@ -468,13 +477,16 @@ snap_prepare() {
} }
snap_preseed() { snap_preseed() {
# Preseed a snap in the image # Preseed a snap in the image (snap_prepare must be called once prior)
local CHROOT_ROOT=$1 local CHROOT_ROOT=$1
local SNAP=$2 local SNAP=$2
# Per Ubuntu policy, all seeded snaps (with the exception of the core # Per Ubuntu policy, all seeded snaps (with the exception of the core
# snap) must pull from stable/ubuntu-$(release_ver) as their channel. # snap) must pull from stable/ubuntu-$(release_ver) as their channel.
local CHANNEL=${3:-"stable/ubuntu-$(release_ver)"} local CHANNEL=${3:-"stable/ubuntu-$(release_ver)"}
snap_prepare $CHROOT_ROOT if [ ! -e "$CHROOT_ROOT/var/lib/snapd/seed/assertions/model" ]; then
echo "ERROR: Snap model assertion not present, snap_prepare must be called"
exit 1
fi
_snap_preseed $CHROOT_ROOT $SNAP $CHANNEL _snap_preseed $CHROOT_ROOT $SNAP $CHANNEL
} }