mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-04-07 08:13:37 +00:00
Rename to ubuntu-server-live; some build process fixes.
This commit is contained in:
parent
bf958b1472
commit
e577ed7672
@ -105,7 +105,7 @@ case $PROJECT in
|
||||
ubuntu-cpc)
|
||||
IMAGEFORMAT=ext4
|
||||
;;
|
||||
ubuntu-server-next)
|
||||
ubuntu-server-live)
|
||||
IMAGEFORMAT=plain
|
||||
;;
|
||||
esac
|
||||
@ -171,7 +171,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
|
||||
ubuntu-server)
|
||||
add_package live oem-config-debconf ubiquity-frontend-debconf
|
||||
;;
|
||||
ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-touch-custom|ubuntu-cpc|ubuntu-desktop-next|ubuntu-server-next)
|
||||
ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-touch-custom|ubuntu-cpc|ubuntu-desktop-next|ubuntu-server-live)
|
||||
;;
|
||||
*)
|
||||
add_package live oem-config-gtk ubiquity-frontend-gtk
|
||||
@ -370,12 +370,12 @@ case $PROJECT in
|
||||
PREINSTALL_POOL_SEEDS='server-ship'
|
||||
;;
|
||||
|
||||
ubuntu-server-next)
|
||||
ubuntu-server-live)
|
||||
add_task install minimal
|
||||
add_task install standard
|
||||
add_task install server
|
||||
COMPONENTS='main restricted universe'
|
||||
add_package install cloud-init
|
||||
add_task install cloud-image
|
||||
COMPONENTS='main'
|
||||
;;
|
||||
|
||||
ubuntu-core)
|
||||
@ -580,7 +580,7 @@ case $ARCH in
|
||||
esac
|
||||
|
||||
case $PROJECT in
|
||||
ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-touch-custom|ubuntu-server-next)
|
||||
ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-touch-custom)
|
||||
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
|
||||
KERNEL_FLAVOURS=none
|
||||
BINARY_REMOVE_LINUX=false
|
||||
@ -759,7 +759,7 @@ EOF
|
||||
fi
|
||||
;;
|
||||
|
||||
ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*|ubuntu-server-next:*)
|
||||
ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*|ubuntu-server-live:*)
|
||||
cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
|
||||
config/
|
||||
;;
|
||||
|
@ -27,7 +27,7 @@ cp -a chroot/* binary/boot/squashfs.dir
|
||||
|
||||
apt-get -qqy install squashfs-tools
|
||||
|
||||
squashfs_f="${PWD}/livecd.ubuntu-server-next.squashfs"
|
||||
squashfs_f="${PWD}/livecd.${PROJECT}.squashfs"
|
||||
squashfs_f_manifest="${squashfs_f}.manifest"
|
||||
|
||||
dpkg-query --admindir=binary/boot/squashfs.dir/var/lib/dpkg -W > ${squashfs_f_manifest}
|
@ -161,7 +161,7 @@ umount "binary/boot/squashfs.dir/tmp"
|
||||
|
||||
apt-get -qqy install squashfs-tools
|
||||
|
||||
squashfs_f="${PWD}/livecd.ubuntu-server-next.installer.squashfs"
|
||||
squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"
|
||||
|
||||
(cd "$OVERLAY_ROOT/" &&
|
||||
mksquashfs . ${squashfs_f} \
|
Loading…
x
Reference in New Issue
Block a user