~seb128/debian-cd/splash-for-canary

« back to all changes in this revision

Viewing changes to tools/boot/impish/common.sh

  • Committer: Sebastien Bacher
  • Date: 2021-10-05 08:03:55 UTC
  • Revision ID: seb128@ubuntu.com-20211005080355-hk3pwu528e5l6nc1
Tweak the kernel parameter order for canary

The splash option needs to be at the end of the line to be copied

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
default_kernel_params() {
3
3
    case $PROJECT in
4
4
        ubuntu)
5
 
            # for multi-layer images, add a kernel command line option to set layerfs-path
6
 
            # and select the leaf filesystem to determine the list of layers to merge in
7
 
            # an overlay and boot from.
8
 
            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu.seed maybe-ubiquity quiet splash --- "
9
5
            if [ "$SUBPROJECT" = "canary" ]; then
10
 
                KERNEL_PARAMS="layerfs-path=minimal.standard.live.squashfs ${KERNEL_PARAMS}"
 
6
                # for multi-layer images, add a kernel command line option to set layerfs-path
 
7
                # and select the leaf filesystem to determine the list of layers to merge in
 
8
                # an overlay and boot from.
 
9
                KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }layerfs-path=minimal.standard.live.squashfs maybe-ubiquity --- quiet splash"
 
10
            else
 
11
                KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu.seed maybe-ubiquity quiet splash --- "
11
12
            fi
12
13
            ;;
13
14
        ubuntukylin)