Doing this oddly results in findmnt never stat(2)'ing the target directory, which might be problematic with stale NFS mounts and maybe autofs. Fixes FS#36629, I suppose. Signed-off-by: Dave Reisner --- install/autodetect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/autodetect b/install/autodetect index d6e9e29..3710e68 100644 --- a/install/autodetect +++ b/install/autodetect @@ -37,7 +37,7 @@ build() { fi # detect filesystem for separate /usr - if usrfstype=$(findmnt -snero fstype --tab-file '/etc/fstab' /usr); then + if usrfstype=$(findmnt -snero fstype --tab-file '/etc/fstab' -T '/usr'); then add_if_avail "$usrfstype" fi -- 1.8.4

Running as non-root is usually for my own dev purposes, but someone might do this and be surprised when a directory/file that needs permissions other than root isn't preserved. Signed-off-by: Dave Reisner --- mkinitcpio | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mkinitcpio b/mkinitcpio index 2d8c579..8139ee0 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -203,8 +203,12 @@ build_image() { ;; esac - cpio_opts=('-R' '0:0' '-0' '-o' '-H' 'newc') + cpio_opts=('-0' '-o' '-H' 'newc') (( _optquiet )) && cpio_opts+=('--quiet') + if (( EUID != 0 )); then + warning 'Not building as root, ownership cannot be preserved' + cpio_opts+=('-R' '0:0') + fi # write version stamp printf '%s' "$version" > "$BUILDROOT/VERSION" -- 1.8.4