From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 2/4] wsdd: remove wsdd initscript as now covered by samba
 - fixes bug#13445
Date: Tue, 19 Mar 2024 12:44:58 +0100
Message-ID: <f5ada644-6d2b-4a5b-8744-5270c96e5082@ipfire.org>
In-Reply-To: <94866096-78EF-46C3-B838-4F802E684E04@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4640222492214433647=="
List-Id: <development.lists.ipfire.org>

--===============4640222492214433647==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable


On 19/03/2024 12:15, Michael Tremer wrote:
> This patch seems to remove the initscript but does not remove it from the r=
oot file.
>=20
> I merged the whole lot and updated the root file. Please let me know if tha=
t was incorrect.

Whoops, my error. Removing it from the rootfile was absolutely the=20
correct thing to do. I removed the bits from the LFS but forgot the=20
rootfile.

Thanks for catching that.

Regards,
Adolf.
>=20
> -Michael
>=20
>> On 18 Mar 2024, at 18:43, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>
>> Fixes: bug#13445
>> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>> ---
>> src/initscripts/packages/wsdd | 78 -----------------------------------
>> 1 file changed, 78 deletions(-)
>> delete mode 100644 src/initscripts/packages/wsdd
>>
>> diff --git a/src/initscripts/packages/wsdd b/src/initscripts/packages/wsdd
>> deleted file mode 100644
>> index 68e8f3de0..000000000
>> --- a/src/initscripts/packages/wsdd
>> +++ /dev/null
>> @@ -1,78 +0,0 @@
>> -#!/bin/sh
>> -#########################################################################=
######
>> -#                                                                        =
     #
>> -# IPFire.org - A linux based firewall                                    =
     #
>> -# Copyright (C) 2007-2024  IPFire Team  <info(a)ipfire.org>              =
       #
>> -#                                                                        =
     #
>> -# This program is free software: you can redistribute it and/or modify   =
     #
>> -# it under the terms of the GNU General Public License as published by   =
     #
>> -# the Free Software Foundation, either version 3 of the License, or      =
     #
>> -# (at your option) any later version.                                    =
     #
>> -#                                                                        =
     #
>> -# This program is distributed in the hope that it will be useful,        =
     #
>> -# but WITHOUT ANY WARRANTY; without even the implied warranty of         =
     #
>> -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          =
     #
>> -# GNU General Public License for more details.                           =
     #
>> -#                                                                        =
     #
>> -# You should have received a copy of the GNU General Public License      =
     #
>> -# along with this program.  If not, see <http://www.gnu.org/licenses/>.  =
     #
>> -#                                                                        =
     #
>> -#########################################################################=
######
>> -
>> -. /etc/sysconfig/rc
>> -. $rc_functions
>> -
>> -eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
>> -
>> -PIDFILE=3D"/var/run/wsdd.pid"
>> -
>> -case "$1" in
>> - start)
>> - ARGS=3D(
>> - # Launch as non-privileged user
>> - "--user" "wsdd:wsdd"
>> -
>> - # Launch in chroot
>> - "--chroot" "/var/run/wsdd"
>> -
>> - # Only use IPv4
>> - "--ipv4only"
>> -
>> - # Configure the workgroup
>> - "--workgroup" "$(testparm -s --parameter-name workgroup 2>/dev/null)"
>> - )
>> -
>> - # Conditionally add the GREEN/BLUE interface
>> - for intf in GREEN_DEV BLUE_DEV; do
>> - if [ -n "${!intf}" ]; then
>> - ARGS+=3D( "--interface" "${!intf}" )
>> - fi
>> - done
>> -
>> - # Create chroot directory for wsdd
>> - mkdir -p /var/run/wsdd
>> -
>> - boot_mesg "Starting Web Service Discovery Host Daemon..."
>> - loadproc -b -p "${PIDFILE}" /usr/bin/wsdd "${ARGS[@]}"
>> - ;;
>> -
>> - stop)
>> - boot_mesg "Stopping Web Service Discovery Host Daemon..."
>> - killproc -p "${PIDFILE}" /usr/bin/wsdd
>> - ;;
>> -
>> - status)
>> - statusproc /usr/bin/wsdd
>> - ;;
>> -
>> - restart)
>> - $0 stop
>> - $0 start
>> - ;;
>> -
>> - *)
>> - echo "Usage: $0 (start|stop|status|restart)"
>> - exit 1
>> - ;;
>> -esac
>> -
>> --=20
>> 2.44.0
>>
>=20

--=20
Sent from my laptop

--===============4640222492214433647==--