Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-25 17:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

manually merge upload of 2.359

Browse Source
This commit is contained in:
Michael Vogt 2015-12-07 11:20:57 +01:00
parent fb84e38cf2
commit c97c00d749
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,10 +1,18 @@
livecd-rootfs (2.359) xenial; urgency=medium livecd-rootfs (2.360) UNRELEASED; urgency=medium
* live-build/ubuntu-core/hooks/01-setup_user.chroot: * live-build/ubuntu-core/hooks/01-setup_user.chroot:
- add default ubuntu user to "adm" and "sudo" groups - add default ubuntu user to "adm" and "sudo" groups
-- Michael Vogt <michael.vogt@ubuntu.com> Mon, 07 Dec 2015 11:03:35 +0100 -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 07 Dec 2015 11:03:35 +0100
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
} }