diff options
| author | Daniel Baumann <daniel@debian.org> | 2013-02-18 13:56:07 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:06 +0200 |
| commit | dbfe7b10d78d8a71ee404af0d3952af48eeb4d1d (patch) | |
| tree | 709a2c9331091622e6b96bb22b52410d0109ccb1 /scripts/build/chroot_devpts | |
| parent | 04cec317cc4437eed514f4277f6779010e587662 (diff) | |
| download | vyos-live-build-dbfe7b10d78d8a71ee404af0d3952af48eeb4d1d.tar.gz vyos-live-build-dbfe7b10d78d8a71ee404af0d3952af48eeb4d1d.zip | |
Removing incomplete support for fakeroot.
Diffstat (limited to 'scripts/build/chroot_devpts')
| -rwxr-xr-x | scripts/build/chroot_devpts | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/scripts/build/chroot_devpts b/scripts/build/chroot_devpts index 6b1a348a0..6075544c1 100755 --- a/scripts/build/chroot_devpts +++ b/scripts/build/chroot_devpts @@ -43,14 +43,11 @@ case "${1}" in # Creating lock file Create_lockfile .lock - if [ "${LB_USE_FAKEROOT}" != "true" ] - then - # Creating mountpoint - mkdir -p chroot/dev/pts + # Creating mountpoint + mkdir -p chroot/dev/pts - # Mounting /dev/pts - mount devpts-live -t devpts chroot/dev/pts || true - fi + # Mounting /dev/pts + mount devpts-live -t devpts chroot/dev/pts || true # Creating stage file Create_stagefile .build/chroot_devpts @@ -66,14 +63,11 @@ case "${1}" in Create_lockfile .lock # Unmounting /dev/pts - if [ "${LB_USE_FAKEROOT}" != "true" ] + if grep -qs "$(pwd)/chroot/dev/pts" /proc/mounts || Find_files chroot/dev/pts/* then - if grep -qs "$(pwd)/chroot/dev/pts" /proc/mounts || Find_files chroot/dev/pts/* - then - umount chroot/dev/pts - else - umount -f chroot/dev/pts > /dev/null 2>&1 || true - fi + umount chroot/dev/pts + else + umount -f chroot/dev/pts > /dev/null 2>&1 || true fi # Removing stage file |