Attachment 251879 Details for Bug 280137 – rename rc scripts to comply to recommendations

[patch] rename rc scripts to comply to recommendations

bacula_rc.diff (text/plain), 6.76 KB, created by Alexander Leidinger on 2024-07-05 09:00:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Leidinger

Created: 2024-07-05 09:00:16 UTC

Size: 6.76 KB

patch

obsolete

>diff --git UPDATING UPDATING
>index 6f7d93fd151..5e8b1fd8109 100644
>--- UPDATING
>+++ UPDATING
>@@ -5,6 +5,21 @@ they are unavoidable.
> You should get into the habit of checking this file for changes each time
> you update your ports collection, before attempting any port upgrades.
> 
>+202407xx:
>+  AFFECTS: sysutils/bacula*-server
>+  AUTHOR: netchildFreeBSD.org
>+
>+  The start scripts of bacula have been renamed to bacula_dir and
>+  bacula_sd for improved compatibility with other parts of the
>+  system. The automatic start at boot (rc.conf variable settings) is
>+  not affected, but if you have some other automatism you may want to
>+  change
>+    ".../etc/rc.d/bacula-dir" to ".../etc/rc.d/bacula_dir"
>+    ".../etc/rc.d/bacula-sd" to ".../etc/rc.d/bacula_sd"
>+  or
>+    "service bacula-dir ..." to "service bacula_dir ..."
>+    "service bacula-sd ..." to "service bacula_sd ..."
>+
> 20240704:
>   AFFECTS: net/xrdp and x11-drivers/xorgxrdp
>   AUTHOR: meta@FreeBSD.org
>diff --git sysutils/bacula11-server/Makefile sysutils/bacula11-server/Makefile
>index 39eb9172f0d..631fdc6e5da 100644
>--- sysutils/bacula11-server/Makefile
>+++ sysutils/bacula11-server/Makefile
>@@ -51,7 +51,7 @@ OPTIONS_SUB=		yes
> 
> .if !defined(WITH_CLIENT_ONLY)
> LIB_DEPENDS+=	libbac-${PORTVERSION}.so:sysutils/bacula11-client
>-USE_RC_SUBR?=	bacula-dir bacula-sd
>+USE_RC_SUBR?=	bacula_dir bacula_sd
> .endif
> 
> .if defined(WITH_CLIENT_ONLY)
>diff --git sysutils/bacula11-server/files/bacula_dir.in sysutils/bacula11-server/files/bacula_dir.in
>index 1825c924306..57e9fa84df5 100644
>--- sysutils/bacula11-server/files/bacula_dir.in
>+++ sysutils/bacula11-server/files/bacula_dir.in
>@@ -23,6 +23,7 @@ load_rc_config $name
> : ${bacula_dir_enable="NO"}
> : ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-dir.conf"}
> : ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"}
>+: ${bacula_dir_svcj_options:="net_basic"}
> 
> pidfile="${bacula_dir_pidfile}"
> 
>diff --git sysutils/bacula11-server/files/bacula_sd.in sysutils/bacula11-server/files/bacula_sd.in
>index 2020f846f1c..664d896fabe 100644
>--- sysutils/bacula11-server/files/bacula_sd.in
>+++ sysutils/bacula11-server/files/bacula_sd.in
>@@ -23,6 +23,7 @@ load_rc_config $name
> : ${bacula_sd_enable="NO"}
> : ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-sd.conf"}
> : ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"}
>+: ${bacula_sd_svcj_options:="net_basic"}
> 
> pidfile="${bacula_sd_pidfile}"
> 
>diff --git sysutils/bacula13-server/Makefile sysutils/bacula13-server/Makefile
>index 8d9021c02ee..6ad9ab686ce 100644
>--- sysutils/bacula13-server/Makefile
>+++ sysutils/bacula13-server/Makefile
>@@ -48,7 +48,7 @@ OPTIONS_SUB=		yes
> 
> .if !defined(WITH_CLIENT_ONLY)
> LIB_DEPENDS+=	libbac-${PORTVERSION}.so:sysutils/bacula13-client
>-USE_RC_SUBR?=	bacula-dir bacula-sd
>+USE_RC_SUBR?=	bacula_dir bacula_sd
> .endif
> 
> .if defined(WITH_CLIENT_ONLY)
>diff --git sysutils/bacula13-server/files/bacula_dir.in sysutils/bacula13-server/files/bacula_dir.in
>index 1825c924306..57e9fa84df5 100644
>--- sysutils/bacula13-server/files/bacula_dir.in
>+++ sysutils/bacula13-server/files/bacula_dir.in
>@@ -23,6 +23,7 @@ load_rc_config $name
> : ${bacula_dir_enable="NO"}
> : ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-dir.conf"}
> : ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"}
>+: ${bacula_dir_svcj_options:="net_basic"}
> 
> pidfile="${bacula_dir_pidfile}"
> 
>diff --git sysutils/bacula13-server/files/bacula_sd.in sysutils/bacula13-server/files/bacula_sd.in
>index 2020f846f1c..664d896fabe 100644
>--- sysutils/bacula13-server/files/bacula_sd.in
>+++ sysutils/bacula13-server/files/bacula_sd.in
>@@ -23,6 +23,7 @@ load_rc_config $name
> : ${bacula_sd_enable="NO"}
> : ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-sd.conf"}
> : ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"}
>+: ${bacula_sd_svcj_options:="net_basic"}
> 
> pidfile="${bacula_sd_pidfile}"
> 
>diff --git sysutils/bacula15-server/Makefile sysutils/bacula15-server/Makefile
>index 33848b9db16..f77673adb42 100644
>--- sysutils/bacula15-server/Makefile
>+++ sysutils/bacula15-server/Makefile
>@@ -50,7 +50,7 @@ OPTIONS_SUB=	yes
> 
> .if !defined(WITH_CLIENT_ONLY)
> LIB_DEPENDS+=	libbac-${LIB_VERSION}.so:sysutils/bacula15-client
>-USE_RC_SUBR?=	bacula-dir bacula-sd
>+USE_RC_SUBR?=	bacula_dir bacula_sd
> .endif
> 
> .if defined(WITH_CLIENT_ONLY)
>diff --git sysutils/bacula15-server/files/bacula_dir.in sysutils/bacula15-server/files/bacula_dir.in
>index 1825c924306..57e9fa84df5 100644
>--- sysutils/bacula15-server/files/bacula_dir.in
>+++ sysutils/bacula15-server/files/bacula_dir.in
>@@ -23,6 +23,7 @@ load_rc_config $name
> : ${bacula_dir_enable="NO"}
> : ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-dir.conf"}
> : ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"}
>+: ${bacula_dir_svcj_options:="net_basic"}
> 
> pidfile="${bacula_dir_pidfile}"
> 
>diff --git sysutils/bacula15-server/files/bacula_sd.in sysutils/bacula15-server/files/bacula_sd.in
>index 2020f846f1c..664d896fabe 100644
>--- sysutils/bacula15-server/files/bacula_sd.in
>+++ sysutils/bacula15-server/files/bacula_sd.in
>@@ -23,6 +23,7 @@ load_rc_config $name
> : ${bacula_sd_enable="NO"}
> : ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-sd.conf"}
> : ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"}
>+: ${bacula_sd_svcj_options:="net_basic"}
> 
> pidfile="${bacula_sd_pidfile}"
> 
>diff --git sysutils/bacula9-server/Makefile sysutils/bacula9-server/Makefile
>index 54374793f41..3669940a6ec 100644
>--- sysutils/bacula9-server/Makefile
>+++ sysutils/bacula9-server/Makefile
>@@ -50,7 +50,7 @@ OPTIONS_SUB=		yes
> 
> .if !defined(WITH_CLIENT_ONLY)
> LIB_DEPENDS+=	libbac-${PORTVERSION}.so:sysutils/bacula9-client
>-USE_RC_SUBR?=	bacula-dir bacula-sd
>+USE_RC_SUBR?=	bacula_dir bacula_sd
> .endif
> 
> .if defined(WITH_CLIENT_ONLY)
>diff --git sysutils/bacula9-server/files/bacula_dir.in sysutils/bacula9-server/files/bacula_dir.in
>index 1825c924306..57e9fa84df5 100644
>--- sysutils/bacula9-server/files/bacula_dir.in
>+++ sysutils/bacula9-server/files/bacula_dir.in
>@@ -23,6 +23,7 @@ load_rc_config $name
> : ${bacula_dir_enable="NO"}
> : ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-dir.conf"}
> : ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"}
>+: ${bacula_dir_svcj_options:="net_basic"}
> 
> pidfile="${bacula_dir_pidfile}"
> 
>diff --git sysutils/bacula9-server/files/bacula_sd.in sysutils/bacula9-server/files/bacula_sd.in
>index 2020f846f1c..664d896fabe 100644
>--- sysutils/bacula9-server/files/bacula_sd.in
>+++ sysutils/bacula9-server/files/bacula_sd.in
>@@ -23,6 +23,7 @@ load_rc_config $name
> : ${bacula_sd_enable="NO"}
> : ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-sd.conf"}
> : ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"}
>+: ${bacula_sd_svcj_options:="net_basic"}
> 
> pidfile="${bacula_sd_pidfile}"
>

Actions: View | Diff

Attachments on bug 280137: 251879