Skip to content

Commit 5195f8b

Browse files
authored
packaging: Create cloud user and group if not present (apache#5115)
1 parent b9712c6 commit 5195f8b

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

packaging/centos7/cloud.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-inte
392392
/usr/bin/systemctl off cloudstack-management || true
393393

394394
%pre management
395-
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -c "CloudStack unprivileged user" \
395+
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \
396396
-r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true
397397

398398
rm -rf %{_localstatedir}/cache/cloudstack
@@ -476,7 +476,7 @@ fi
476476
systemctl daemon-reload
477477

478478
%pre usage
479-
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -c "CloudStack unprivileged user" \
479+
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \
480480
-r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true
481481

482482
%preun usage

packaging/centos8/cloud.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-inte
391391
/usr/bin/systemctl off cloudstack-management || true
392392

393393
%pre management
394-
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -c "CloudStack unprivileged user" \
394+
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \
395395
-r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true
396396

397397
rm -rf %{_localstatedir}/cache/cloudstack
@@ -475,7 +475,7 @@ fi
475475
systemctl daemon-reload
476476

477477
%pre usage
478-
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -c "CloudStack unprivileged user" \
478+
id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -U -c "CloudStack unprivileged user" \
479479
-r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true
480480

481481
%preun usage

0 commit comments

Comments
 (0)