Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-08 09:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.359 to ubuntu/xenial-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: fc5a8afdab08a12e9b45b1d26b83b3d20f1684a9

New changelog entries:
  * ubuntu-cpc:
    - add devpts-live to hook builds
    - add logic to settle the disks after UEFI builds
This commit is contained in:
Ben Howard 2015-11-23 09:34:57 -07:00 committed by usd-importer
parent fc5a8afdab
commit 197a5ea751
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.359) xenial; urgency=medium
* ubuntu-cpc:
- add devpts-live to hook builds
- add logic to settle the disks after UEFI builds
-- Ben Howard <ben.howard@ubuntu.com> Mon, 23 Nov 2015 09:34:57 -0700
livecd-rootfs (2.358) xenial; urgency=medium livecd-rootfs (2.358) xenial; urgency=medium
* Fix typo in ubuntu-cpc preventing non-intel builds. * Fix typo in ubuntu-cpc preventing non-intel builds.

2
live-build/ubuntu-cpc/functions
View File

@ -46,6 +46,7 @@ mount_partition() {
mount "$partition" "$mountpoint" mount "$partition" "$mountpoint"
mount --bind /dev "$mountpoint/dev" mount --bind /dev "$mountpoint/dev"
mount devpts-live -t devpts "$mountpoint/dev/pts"
mount proc-live -t proc "$mountpoint/proc" mount proc-live -t proc "$mountpoint/proc"
mount sysfs-live -t sysfs "$mountpoint/sys" mount sysfs-live -t sysfs "$mountpoint/sys"
mv "$mountpoint/etc/resolv.conf" resolv.conf.tmp mv "$mountpoint/etc/resolv.conf" resolv.conf.tmp
@ -58,6 +59,7 @@ umount_partition() {
mv resolv.conf.tmp "$mountpoint/etc/resolv.conf" mv resolv.conf.tmp "$mountpoint/etc/resolv.conf"
umount "$mountpoint/proc" umount "$mountpoint/proc"
umount "$mountpoint/sys" umount "$mountpoint/sys"
umount "$mountpoint/dev/pts"
umount "$mountpoint/dev" umount "$mountpoint/dev"
umount "$mountpoint" umount "$mountpoint"
} }

4
live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
View File

@ -116,7 +116,11 @@ EOF
chroot mountpoint apt-get -y update chroot mountpoint apt-get -y update
rm mountpoint/tmp/device.map rm mountpoint/tmp/device.map
sync
umount mountpoint/boot/efi umount mountpoint/boot/efi
sleep 5
udevadm settle
mount
umount_partition mountpoint umount_partition mountpoint
rmdir mountpoint rmdir mountpoint
} }