diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-09-02 14:19:19 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-09-03 09:54:42 +0200 |
commit | fc5f5c2a3c7adb54369d4d2851ba772b914afbcb (patch) | |
tree | 57d7501580b8196afda917e847cb2278c91815d9 /mkosi.build | |
parent | b2cdc2c05ee77405fa00f3a330bd19cb755a01d0 (diff) | |
download | systemd-fc5f5c2a3c7adb54369d4d2851ba772b914afbcb.tar.gz |
mkosi: drop the code to determine nobody user name
The comments were outdated: at least "nfsnobody" is not used in Fedora since a
few years. So I hope we don't need this anymore. The meson build scripts do
autodetection on their own.
Diffstat (limited to 'mkosi.build')
-rwxr-xr-x | mkosi.build | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/mkosi.build b/mkosi.build index 201b1888d5..4924bf300c 100755 --- a/mkosi.build +++ b/mkosi.build @@ -64,46 +64,10 @@ if [ ! -f "$BUILDDIR"/build.ninja ] ; then rootprefix=/${rootprefix#/} fi - nobody_user=`id -u -n 65534 2> /dev/null` - if [ "$nobody_user" != "" ] ; then - # Validate that we can translate forth and back - if [ "`id -u $nobody_user`" != 65534 ] ; then - nobody_user="" - fi - fi - if [ "$nobody_user" = "" ] ; then - if id -u nobody 2> /dev/null ; then - # The "nobody" user is defined already for something else, pick the Fedora name - nobody_user=nfsnobody - else - # The "nobody" user name is free, use it - nobody_user=nobody - fi - fi - - nobody_group=`id -g -n 65534 2> /dev/null` - if [ "$nobody_group" != "" ] ; then - # Validate that we can translate forth and back - if [ "`id -g $nobody_group`" != 65534 ] ; then - nobody_group="" - fi - fi - if [ "$nobody_group" = "" ] ; then - if id -u nobody 2> /dev/null ; then - # The "nobody" group is defined already for something else, pick the Fedora name - nobody_group=nfsnobody - else - # The "nobody" group name is free, use it - nobody_group=nobody - fi - fi - meson "$BUILDDIR" \ -D "sysvinit-path=$sysvinit_path" \ -D "rootprefix=$rootprefix" \ -D man=false \ - -D "nobody-user=$nobody_user" \ - -D "nobody-group=$nobody_group" \ -D translations=false \ -D version-tag="${VERSION_TAG}" fi |