isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix support for pp_systemd_disabled and check for systemd existence.

Browse Source 
On our build schroots we don't have systemctl installed but do have
the /etc/systemd and /lib/systemd (or /usr/lib/systemd) directories.
This commit is contained in:
Todd C. Miller
2020-04-22 15:23:05 -06:00
parent 8c5befaae8
commit 40f47f0136
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
etc/sudo-logsrvd.pp
View File

@@ -224,10 +224,10 @@ This makes it possible to have all sudo I/O logs on a central server."
pp_macos_service_id=ws.sudo.sudo_logsrvd pp_macos_service_id=ws.sudo.sudo_logsrvd
%endif %endif
%if [rpm,deb] %if [rpm,deb]
# Only include systemd support if we find systemctl on the build # Only include systemd support if it exists on the build machine.
# machine. This assumes that we are building on the same distro # This assumes that we are building on the same distro that the
# that the package will be installed on. # package will be installed on (which is the case for sudo).
if command -v systemctl >/dev/null; then if test -d /etc/systemd; then
for d in `pkg-config systemd --variable=systemdsystemunitdir 2>/dev/null` /lib/systemd/system /usr/lib/systemd/system; do for d in `pkg-config systemd --variable=systemdsystemunitdir 2>/dev/null` /lib/systemd/system /usr/lib/systemd/system; do
if test -d "$d"; then if test -d "$d"; then
break break

18
scripts/pp
View File

@@ -4079,8 +4079,8 @@ pp_deb_handle_services() {
pp_load_service_vars $svc pp_load_service_vars $svc
# Create init script and systemd service file (unless they exists) # Create init script and systemd service file (unless they exists)
pp_deb_service_make_init_script $svc || pp_deb_service_make_service_files $svc ||
pp_error "could not create init script for service $svc" pp_error "could not create service files for $svc"
#-- append %post code to install the svc #-- append %post code to install the svc
test x"yes" = x"$enable" && test x"yes" = x"$enable" &&
@@ -4511,7 +4511,7 @@ pp_backend_deb_init_svc_vars () {
stop_priority=50 #-- stop_priority = 100 - start_priority stop_priority=50 #-- stop_priority = 100 - start_priority
} }
pp_deb_service_make_init_script () { pp_deb_service_make_service_files () {
local svc=${svc_init_filename:-$1} local svc=${svc_init_filename:-$1}
local script="${svc_init_filepath:-"/etc/init.d"}/$svc" local script="${svc_init_filepath:-"/etc/init.d"}/$svc"
local out=$pp_destdir$script local out=$pp_destdir$script
@@ -5883,8 +5883,8 @@ pp_backend_rpm () {
for svc in $pp_services; do for svc in $pp_services; do
pp_load_service_vars $svc pp_load_service_vars $svc
pp_rpm_service_make_init_script $svc || pp_rpm_service_make_service_files $svc ||
pp_error "could not create init script for service $svc" pp_error "could not create service files for $svc"
#-- append %post code to install the svc #-- append %post code to install the svc
pp_rpm_service_install $svc >> $pp_wrkdir/%post.run pp_rpm_service_install $svc >> $pp_wrkdir/%post.run
@@ -6412,7 +6412,7 @@ pp_rpm_service_group_make_init_script () {
chmod 755 $out chmod 755 $out
} }
pp_rpm_service_make_init_script () { pp_rpm_service_make_service_files () {
local svc=${svc_init_filename:-$1} local svc=${svc_init_filename:-$1}
local script="${svc_init_filepath:-"/etc/init.d"}/$svc" local script="${svc_init_filepath:-"/etc/init.d"}/$svc"
local out=$pp_destdir$script local out=$pp_destdir$script
@@ -8808,7 +8808,7 @@ pp_backend_bsd_function() {
pp_systemd_make_service_file() { pp_systemd_make_service_file() {
local svc f local svc f
if [ "${pp_systemd_disabled}:-false" = "true" ]; then if [ "${pp_systemd_disabled:-false}" = "true" ]; then
return return
fi fi
@@ -8885,7 +8885,7 @@ pp_systemd_service_init_common () {
} }
pp_systemd_service_install_common () { pp_systemd_service_install_common () {
if [ "${pp_systemd_disabled}:-false" = "true" ]; then if [ "${pp_systemd_disabled:-false}" = "true" ]; then
cat<<'.' cat<<'.'
# systemd support disabled # systemd support disabled
@@ -8970,7 +8970,7 @@ pp_systemd_service_install_common () {
} }
pp_systemd_service_remove_common () { pp_systemd_service_remove_common () {
if [ "${pp_systemd_disabled}:-false" = "true" ]; then if [ "${pp_systemd_disabled:-false}" = "true" ]; then
cat<<'.' cat<<'.'
# systemd support disabled # systemd support disabled