commit:     95f319609f352948f30b552ea453811c14255900
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 16:26:40 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 16:39:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95f31960

app-emulation/ganeti: remove unused multiple-users support

The metadata description said running VMs as different users, but that
was never correct. It was running the daemons as different users, but
QEMU still ran as root and dropped (some) privileges.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-emulation/ganeti/ganeti-3.0.2-r2.ebuild | 24 +++++++++++++-----------
 app-emulation/ganeti/metadata.xml           |  1 -
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild 
b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
index 9487945d0a93..bf35bdba6614 100644
--- a/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
+++ b/app-emulation/ganeti/ganeti-3.0.2-r2.ebuild
@@ -35,7 +35,7 @@ HOMEPAGE="http://www.ganeti.org/";
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="drbd experimental ipv6 kvm lxc monitoring multiple-users rbd syslog test 
xen restricted-commands"
+IUSE="drbd experimental ipv6 kvm lxc monitoring rbd syslog test xen 
restricted-commands"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="|| ( kvm xen lxc )
@@ -208,12 +208,14 @@ pkg_setup() {
        local user
        python-single-r1_pkg_setup
 
-       if use multiple-users; then
-               for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
-                       enewgroup ${user}
-                       enewuser ${user} -1 -1 -1 ${user}
-               done
-       fi
+       # Unknown if this functionality was ever used. Maybe re-introduce if 
issues
+       # reported.
+       #if use multiple-users; then
+       #       for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
+       #               enewgroup ${user}
+       #               enewuser ${user} -1 -1 -1 ${user}
+       #       done
+       #fi
 }
 
 # These flags get applied in src_prepare and src_configure
@@ -300,10 +302,10 @@ src_configure() {
                --enable-metadata
                $(use_enable restricted-commands)
                $(use_enable test haskell-tests)
-               $(usex multiple-users "--with-default-user=" "" "gnt-daemons" 
"")
-               $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" 
"")
-               $(usex multiple-users "--with-default-group=" "" "gnt-daemons" 
"")
-               $(usex multiple-users "--with-group-prefix=" "" 
"${GROUP_PREFIX}" "")
+               #$(usex multiple-users "--with-default-user=" "" "gnt-daemons" 
"")
+               #$(usex multiple-users "--with-user-prefix=" "" 
"${USER_PREFIX}" "")
+               #$(usex multiple-users "--with-default-group=" "" "gnt-daemons" 
"")
+               #$(usex multiple-users "--with-group-prefix=" "" 
"${GROUP_PREFIX}" "")
                $(use_enable syslog)
                $(use_enable monitoring)
                $(usex kvm '--with-kvm-path=' '' 
"/usr/bin/qemu-system-${kvm_arch}" '')

diff --git a/app-emulation/ganeti/metadata.xml 
b/app-emulation/ganeti/metadata.xml
index 302c0dece0ae..d37ba927d87a 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -23,7 +23,6 @@
                <flag name="drbd">Enable DRBD support</flag>
                <flag name="kvm">Enable KVM support</flag>
                <flag name="lxc">Enable Linux Containers support</flag>
-               <flag name="multiple-users">Enable support for running VMs as 
different users</flag>
                <flag name="monitoring">Enable the ganeti monitoring 
daemon</flag>
                <flag name="restricted-commands">Enable restricted commands in 
the node daemon</flag>
                <flag name="rbd">Enable rados block device support via 
sys-cluster/ceph</flag>

Reply via email to