diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-12 14:52:58 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-03-13 20:28:15 +0000 |
| commit | 34ceb67718bf382adcac9a82d03c0983faf0cfd6 (patch) | |
| tree | c1687d34ac4f3e062675fe27de410f79e4d9ce70 /scripts/build | |
| parent | a46985b08ac8b8c73d8a3965ee83daa4d4c41e22 (diff) | |
| download | vyos-live-build-34ceb67718bf382adcac9a82d03c0983faf0cfd6.tar.gz vyos-live-build-34ceb67718bf382adcac9a82d03c0983faf0cfd6.zip | |
hide mountpoints from nautilus
when building within a home directory, as /proc, /sys, etc are mounted
and unmounted into the chroot at various points in the build, corresponding
entries appear and disappear within the side panel of nautilus.
this is obviously undesirable.
use of `-o x-gvfs-hide` resolves this for the most part. i still see items
occasionally pop up and having spent some time experimenting, i'm putting
it down to buggy behaviour on the part of nautilus. (aside from those
appearing when debootstrap is running - debootstrap also needs this fix).
Gbp-Dch: Short
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/chroot_devpts | 2 | ||||
| -rwxr-xr-x | scripts/build/chroot_proc | 2 | ||||
| -rwxr-xr-x | scripts/build/chroot_selinuxfs | 2 | ||||
| -rwxr-xr-x | scripts/build/chroot_sysfs | 2 | ||||
| -rwxr-xr-x | scripts/build/chroot_tmpfs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/chroot_devpts b/scripts/build/chroot_devpts index 80e30f962..4650efe18 100755 --- a/scripts/build/chroot_devpts +++ b/scripts/build/chroot_devpts @@ -38,7 +38,7 @@ case "${1}" in mkdir -p chroot/dev/pts # Mounting /dev/pts - mount devpts-live -t devpts -o gid=5,mode=620 chroot/dev/pts || true + mount -t devpts -o gid=5,mode=620,x-gvfs-hide devpts-live chroot/dev/pts || true # Creating stage file Create_stagefile .build/chroot_devpts diff --git a/scripts/build/chroot_proc b/scripts/build/chroot_proc index 1d53fe482..8105e8e34 100755 --- a/scripts/build/chroot_proc +++ b/scripts/build/chroot_proc @@ -38,7 +38,7 @@ case "${1}" in mkdir -p chroot/proc # Mounting /proc - mount proc-live -t proc chroot/proc + mount -t proc -o x-gvfs-hide proc-live chroot/proc # Creating stage file Create_stagefile .build/chroot_proc diff --git a/scripts/build/chroot_selinuxfs b/scripts/build/chroot_selinuxfs index 6ef4496d6..570ea7857 100755 --- a/scripts/build/chroot_selinuxfs +++ b/scripts/build/chroot_selinuxfs @@ -40,7 +40,7 @@ case "${1}" in mkdir -p chroot/sys/fs/selinux # Mounting /sys/fs/selinux - mount selinuxfs-live -t selinuxfs chroot/sys/fs/selinux + mount -t selinuxfs -o x-gvfs-hide selinuxfs-live chroot/sys/fs/selinux # Creating stage file Create_stagefile .build/chroot_selinuxfs diff --git a/scripts/build/chroot_sysfs b/scripts/build/chroot_sysfs index bc81501de..58052a6f2 100755 --- a/scripts/build/chroot_sysfs +++ b/scripts/build/chroot_sysfs @@ -38,7 +38,7 @@ case "${1}" in mkdir -p chroot/sys # Mounting /sys - mount sysfs-live -t sysfs chroot/sys + mount -t sysfs -o x-gvfs-hide sysfs-live chroot/sys # Creating stage file Create_stagefile .build/chroot_sysfs diff --git a/scripts/build/chroot_tmpfs b/scripts/build/chroot_tmpfs index 2f94a8fe3..be613d4a8 100755 --- a/scripts/build/chroot_tmpfs +++ b/scripts/build/chroot_tmpfs @@ -41,7 +41,7 @@ case "${1}" in mv chroot/var/lib/dpkg chroot/var/lib/dpkg.tmp mkdir chroot/var/lib/dpkg - mount -t tmpfs tmpfs chroot/var/lib/dpkg + mount -t tmpfs -o x-gvfs-hide tmpfs chroot/var/lib/dpkg mv chroot/var/lib/dpkg.tmp/* chroot/var/lib/dpkg rm -rf chroot/var/lib/dpkg.tmp |