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

Make sure we still mount the kernel filesystems in the disk setup

Browse Source 
We skip the previous unmount/remount behavior because that makes things
unwieldly when there are multiple partitions; but we still have setup to do,
so that /dev is available for grub, etc.
This commit is contained in:
Steve Langasek 2016-02-06 21:26:04 -08:00
parent eb9b43defe
commit e51a8f8aef
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,11 +66,9 @@ mount_image() {
return 0 return 0
} }
mount_partition() { setup_mountpoint() {
partition="$1" local mountpoint="$1"
mountpoint="$2"
mount "$partition" "$mountpoint"
mount --bind /dev "$mountpoint/dev" mount --bind /dev "$mountpoint/dev"
mount devpts-live -t proc "$mountpoint/dev/pts" mount devpts-live -t proc "$mountpoint/dev/pts"
mount proc-live -t proc "$mountpoint/proc" mount proc-live -t proc "$mountpoint/proc"
@ -78,6 +76,15 @@ mount_partition() {
mount -t tmpfs none "$mountpoint/tmp" mount -t tmpfs none "$mountpoint/tmp"
mv "$mountpoint/etc/resolv.conf" resolv.conf.tmp mv "$mountpoint/etc/resolv.conf" resolv.conf.tmp
cp /etc/resolv.conf "$mountpoint/etc/resolv.conf" cp /etc/resolv.conf "$mountpoint/etc/resolv.conf"
}
mount_partition() {
partition="$1"
mountpoint="$2"
mount "$partition" "$mountpoint"
setup_mountpoint "$mountpoint"
} }

2
live-build/ubuntu-cpc/hooks/032-disk-image.binary
View File

@ -70,6 +70,8 @@ fi
cp -a chroot/* mountpoint/ cp -a chroot/* mountpoint/
setup_mountpoint mountpoint
case $ARCH in case $ARCH in
amd64|i386) should_install_grub=1;; amd64|i386) should_install_grub=1;;
*) should_install_grub=0;; *) should_install_grub=0;;