mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-13 22:28:27 +00:00
Source ubuntu-cpc functions from the right place
This commit is contained in:
parent
2048477b0d
commit
e25936cc61
@ -5,7 +5,7 @@ if [ -n "$SUBARCH" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
. /build/config/functions
|
||||
. config/functions
|
||||
|
||||
mkdir binary/boot/filesystem.dir
|
||||
cp -a chroot/* binary/boot/filesystem.dir
|
||||
|
@ -1,6 +1,6 @@
|
||||
#!/bin/bash -ex
|
||||
|
||||
. /build/config/functions
|
||||
. config/functions
|
||||
|
||||
BOOTPART_START=
|
||||
BOOTPART_END=
|
||||
|
@ -9,7 +9,7 @@ case $ARCH in
|
||||
;;
|
||||
esac
|
||||
|
||||
. /build/config/functions
|
||||
. config/functions
|
||||
|
||||
apt-get -qqy install dosfstools gdisk
|
||||
|
||||
|
@ -7,7 +7,7 @@ case $ARCH in
|
||||
;;
|
||||
esac
|
||||
|
||||
. /build/config/functions
|
||||
. config/functions
|
||||
|
||||
create_partitions() {
|
||||
disk_image="$1"
|
||||
|
@ -12,7 +12,7 @@ esac
|
||||
|
||||
apt-get install -qqy qemu-utils
|
||||
|
||||
. /build/config/functions
|
||||
. config/functions
|
||||
|
||||
if [ -f binary/boot/disk.ext4 ]; then
|
||||
convert_to_qcow2 binary/boot/disk.ext4 livecd.ubuntu-cpc.disk1.img
|
||||
|
@ -11,7 +11,7 @@ case $ARCH in
|
||||
exit 0;;
|
||||
esac
|
||||
|
||||
. /build/config/functions
|
||||
. config/functions
|
||||
|
||||
if [ -e binary/boot/disk.ext4 ]; then
|
||||
create_vmdk binary/boot/disk.ext4 livecd.ubuntu-cpc.disk1.vmdk
|
||||
|
@ -35,7 +35,7 @@ case $ARCH in
|
||||
exit 0;;
|
||||
esac
|
||||
|
||||
. /build/config/functions
|
||||
. config/functions
|
||||
|
||||
# Virtualbox is needed for making a small VMDK
|
||||
apt-get -qqy install genisoimage qemu-utils
|
||||
|
@ -9,7 +9,7 @@ if [ ! -d ${my_dir}/extra ]; then
|
||||
fi
|
||||
|
||||
# Export the common functions to the extras
|
||||
. /build/config/functions
|
||||
. config/functions
|
||||
|
||||
# Cleaner execution
|
||||
/bin/run-parts --exit-on-error --regex ".*\.binary" "${extra_d}"
|
||||
|
Loading…
x
Reference in New Issue
Block a user