Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-11 02:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

ubuntu-cpc: Add /dev/pts to hook env, also settle disks after UEFI builds

Browse Source
This commit is contained in:
Robert C Jennings 2017-05-25 20:35:20 -05:00
parent 323da962e5
commit 004ee17e1f
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
livecd-rootfs (2.209.4) trusty; urgency=medium
[Ben Howard]
* ubuntu-cpc:
- add devpts-live to hook builds
- add logic to settle the disks after UEFI builds
-- Robert C Jennings <robert.jennings@canonical.com> Tue, 23 May 2017 20:12:47 -0500
livecd-rootfs (2.209.3) trusty; urgency=medium livecd-rootfs (2.209.3) trusty; urgency=medium
[Ben Howard] [Ben Howard]

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
} }