From 647b521fc7c7a460ebadc1df0e296f706a4a472f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 18 Jan 2017 11:04:36 +0100 Subject: [PATCH] dracut: check for EUID instead of UID --- dracut-init.sh | 2 +- dracut.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dracut-init.sh b/dracut-init.sh index ac3dd82b..239fb684 100644 --- a/dracut-init.sh +++ b/dracut-init.sh @@ -19,7 +19,7 @@ # export LC_MESSAGES=C -if [[ "$UID" = "0" ]]; then +if [[ "$EUID" = "0" ]]; then export DRACUT_CP="cp --reflink=auto --sparse=auto --preserve=mode,timestamps,xattr,links -dfr" else export DRACUT_CP="cp --reflink=auto --sparse=auto --preserve=mode,timestamps,links -dfr" diff --git a/dracut.sh b/dracut.sh index cd3dcfb2..a94401f6 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1388,7 +1388,7 @@ if [[ $kernel_only != yes ]]; then for _d in $hookdirs; do mkdir -m 0755 -p ${initdir}/lib/dracut/hooks/$_d done - if [[ "$UID" = "0" ]]; then + if [[ "$EUID" = "0" ]]; then [ -c ${initdir}/dev/null ] || mknod ${initdir}/dev/null c 1 3 [ -c ${initdir}/dev/kmsg ] || mknod ${initdir}/dev/kmsg c 1 11 [ -c ${initdir}/dev/console ] || mknod ${initdir}/dev/console c 5 1 @@ -1574,7 +1574,7 @@ if [[ $kernel_only != yes ]]; then [[ -f $f ]] && inst_simple "$f" done if ! ldconfig -r "$initdir"; then - if [[ $UID = 0 ]]; then + if [[ $EUID = 0 ]]; then derror "ldconfig exited ungracefully" else derror "ldconfig might need uid=0 (root) for chroot()" @@ -1583,7 +1583,7 @@ if [[ $kernel_only != yes ]]; then fi PRELINK_BIN="$(command -v prelink)" -if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then +if [[ $EUID = 0 ]] && [[ $PRELINK_BIN ]]; then if [[ $DRACUT_FIPS_MODE ]]; then dinfo "*** Installing prelink files ***" inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache @@ -1717,7 +1717,7 @@ if [[ $DRACUT_REPRODUCIBLE ]]; then fi fi -[[ "$UID" != 0 ]] && cpio_owner_root="-R 0:0" +[[ "$EUID" != 0 ]] && cpio_owner_root="-R 0:0" if [[ $create_early_cpio = yes ]]; then echo 1 > "$early_cpio_dir/d/early_cpio"