Different enhancements, primarily for systemd

Create new config option BR2_PACKAGE_BUSYBOX_UDHCPC_SCRIPT to control whether to install optional udhcpc default.script. It is possible that udhcpc is not enabled in busybox config, so default.script is useless in that case.

Signed-off-by Maxim Mikityanskiy <[email protected]>

package/busybox/busybox.mk +4 -0

index f68a2f8..fbdde62 100644
@@ -49,10 +49,20 @@ BUSYBOX_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE)
 BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig
 BUSYBOX_KCONFIG_OPTS = $(BUSYBOX_MAKE_OPTS)
 
+ifeq ($(BR2_PACKAGE_BUSYBOX_UDHCPC_SCRIPT),y)
+define BUSYBOX_INSTALL_UDHCPC_SCRIPT
+	$(INSTALL) -m 0755 -D package/busybox/udhcpc.script \
+		$(TARGET_DIR)/usr/share/udhcpc/default.script; \

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Dear Maxim Mikityanskiy,

Quoted 5 lines · Maxim Mikityanskiy

Create new config option BR2_PACKAGE_BUSYBOX_UDHCPC_SCRIPT to control whether to install optional udhcpc default.script. It is possible that udhcpc is not enabled in busybox config, so default.script is useless in that case.

Quoted 1 line

Signed-off-by Maxim Mikityanskiy <[email protected]>

Thanks for this patch. However, rather than using a new option, can we instead simply test if udhcpc is enabled in the Busybox configuration?

package/busybox/busybox.mk BUSYBOX_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE) · line 65

Quoted 4 lines

package/busybox/busybox.mk +4 -0

+define BUSYBOX_PERMISSIONS
+	/bin/busybox                     f 4755 0  0 - - - - -
+endef
+endif

I believe we can remove /usr/share/udhcpc/default.script entirely from
BUSYBOX_PERMISSIONS: it doesn't need any special permission or ownership, so the default done by Buildroot will be fine in terms of ownership, and in terms of permissions, 755 is already enforced by the install command below.

package/systemd, package/kmod, package/util-linux: don't install bash-completion files if bash is not selected to be installed. Otherwise, install bash-completion files.

package/systemd: don't install zsh-completion files is zsh is not selected to be installed. Otherwise, install zsh-completion files.

package/util-linux: don't install empty /usr/share/bash-completion/completions directory if bash is not going to be installed, and install bash-completion files if bash is selected to be installed.

Signed-off-by Maxim Mikityanskiy <[email protected]>

When systemd is used, /var/lib/dbus becomes dangling symlink, because nobody does mkdir /tmp/dbus, so /var/lib/dbus/machine-id could not be written. On SysVinit systems there is init script that creates /tmp/dbus.

This patch preserves old behavior for SysVinit systems, and introduces new one for systemd-booted systems: /var/lib/dbus is a persistent directory, it holds symlink /var/lib/dbus/machine-id -> /etc/machine-id as machine-id(5) suggests, and /etc/machine-id is managed by systemd.

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/dbus/dbus.mk | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

package/dbus/dbus.mk +7 -7

index faad2b5..266e27b 100644
@@ -73,17 +73,18 @@ endef
 
 DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_REMOVE_DEVFILES
 
-define DBUS_INSTALL_TARGET_FIXUP
+define DBUS_INSTALL_INIT_SYSV
+       $(INSTALL) -m 0755 -D package/dbus/S30dbus \
+               $(TARGET_DIR)/etc/init.d/S30dbus
+
        mkdir -p $(TARGET_DIR)/var/lib
        rm -rf $(TARGET_DIR)/var/lib/dbus
        ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus
 endef
 
-DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_INSTALL_TARGET_FIXUP
-
-define DBUS_INSTALL_INIT_SYSV
-       $(INSTALL) -m 0755 -D package/dbus/S30dbus \
-               $(TARGET_DIR)/etc/init.d/S30dbus
+define DBUS_INSTALL_INIT_SYSTEMD
+       mkdir -p $(TARGET_DIR)/var/lib/dbus
+       ln -sf /etc/machine-id $(TARGET_DIR)/var/lib/dbus/machine-id
 endef
 
 HOST_DBUS_DEPENDENCIES = host-pkgconf host-expat
--

2.2.1

Hi Maxim,

Quoted 4 lines · Maxim Mikityanskiy

When systemd is used, /var/lib/dbus becomes dangling symlink, because nobody does mkdir /tmp/dbus, so /var/lib/dbus/machine-id could not be written. On SysVinit systems there is init script that creates /tmp/dbus.

Maybe we should add /tmp/dbus to a tmpfiles config file (see [1]).

Quoted 1 line

Quoted 4 lines

This patch preserves old behavior for SysVinit systems, and introduces new one for systemd-booted systems: /var/lib/dbus is a persistent directory, it holds symlink /var/lib/dbus/machine-id -> /etc/machine-id as machine-id(5) suggests, and /etc/machine-id is managed by systemd.

This assumes that /etc is witable... which is not necessary the case :-/

Then the last thing to check is that systemd-machine-id-setup correctly generates the machine-id file even if /etc/machine-id is a symlink pointing to a non-existing file.

[1] http://www.freedesktop.org/software/systemd/man/tmpfiles.d.html

Regards,

--
Samuel

When systemd is used, /var/lib/dbus becomes dangling symlink, because nobody does mkdir /tmp/dbus, so /var/lib/dbus/machine-id could not be written. On SysVinit systems there is init script that creates /tmp/dbus.

This patch preserves old behavior for SysVinit systems, and introduces new one for systemd-booted systems: /var/lib/dbus is a persistent directory, it holds symlink /var/lib/dbus/machine-id -> /etc/machine-id as machine-id(5) suggests, and /etc/machine-id is managed by systemd.

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/dbus/dbus.mk | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Systemd depends on mount and nologin from util-linux. Mount from busybox is not fine, because its behavior differs from util-linux mount. Busybox mount does not handle correctly 'mount / -o remount' (should apply options from /etc/fstab). Nologin should be present, because systemd-sysusers uses it as shell for newly created system users.

Signed-off-by Maxim Mikityanskiy <[email protected]>

Systemd depends on mount and nologin from util-linux. Mount from busybox is not fine, because its behavior differs from util-linux mount. Busybox mount does not handle correctly 'mount / -o remount' (should apply options from /etc/fstab). Nologin should be present, because systemd-sysusers uses it as shell for newly created system users.

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/systemd/Config.in | 3 +++
 1 file changed, 3 insertions(+)

Add /etc/profile.d/locale.sh script from Arch Linux to apply systemd locale settings in user shells.

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/systemd/locale.sh  | 26 ++++++++++++++++++++++++++
 package/systemd/systemd.mk |  7 +++++++
 2 files changed, 33 insertions(+)
 create mode 100644 package/systemd/locale.sh

package/systemd/locale.sh new file +26 -0

new file mode 100644
index 0000000..b665872
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+if [ -z "$LANG" ]; then
+  if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then
+    . "$XDG_CONFIG_HOME/locale.conf"
+  elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then
+    . "$HOME/.config/locale.conf"
+  elif [ -r /etc/locale.conf ]; then
+    . /etc/locale.conf
+  fi
+fi
+
+LANG=${LANG:-C}
+export LANG
+[ -n "$LC_CTYPE" ]          && export LC_CTYPE
+[ -n "$LC_NUMERIC" ]        && export LC_NUMERIC
+[ -n "$LC_TIME" ]           && export LC_TIME
+[ -n "$LC_COLLATE" ]        && export LC_COLLATE
+[ -n "$LC_MONETARY" ]       && export LC_MONETARY
+[ -n "$LC_MESSAGES" ]       && export LC_MESSAGES
+[ -n "$LC_PAPER" ]          && export LC_PAPER
+[ -n "$LC_NAME" ]           && export LC_NAME
+[ -n "$LC_ADDRESS" ]        && export LC_ADDRESS
+[ -n "$LC_TELEPHONE" ]      && export LC_TELEPHONE
+[ -n "$LC_MEASUREMENT" ]    && export LC_MEASUREMENT
+[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION

package/systemd/systemd.mk +7 -1

index 92f99c2..ef14c76 100644
@@ -158,6 +158,12 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK
        touch $(TARGET_DIR)/etc/machine-id
 endef
 
+define SYSTEMD_INSTALL_LOCALE_SH_HOOK
+       mkdir -p $(TARGET_DIR)/etc/profile.d
+       $(INSTALL) -D -m 644 package/systemd/locale.sh \
+               $(TARGET_DIR)/etc/profile.d/locale.sh
+endef
+
 define SYSTEMD_SANITIZE_PATH_IN_UNITS
        find $(TARGET_DIR)/lib/systemd/system -name '*.service' \
                -exec $(SED) 's,$(HOST_DIR),,g' {} \;

@@ -172,6 +178,7 @@ endef
 SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
        SYSTEMD_INSTALL_INIT_HOOK \
        SYSTEMD_INSTALL_MACHINEID_HOOK \
+       SYSTEMD_INSTALL_LOCALE_SH_HOOK \
        SYSTEMD_INSTALL_RESOLVCONF_HOOK \
        SYSTEMD_DISABLE_LDCONFIG_SERVICE_HOOK \
        SYSTEMD_SANITIZE_PATH_IN_UNITS
--

2.2.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Hi Maxim,

Quoted 2 lines · Maxim Mikityanskiy

Add /etc/profile.d/locale.sh script from Arch Linux to apply systemd locale settings in user shells.

I don't really see the point of doing it especially when systemd is used. This configuration file is for shell, even busybox should support it...

Why not putting it in the default skeleton?

Any thought about this from other users/developpers?

Quoted 68 lines

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/systemd/locale.sh  | 26 ++++++++++++++++++++++++++
 package/systemd/systemd.mk |  7 +++++++
 2 files changed, 33 insertions(+)
 create mode 100644 package/systemd/locale.sh

package/systemd/locale.sh new file +26 -0

new file mode 100644
index 0000000..b665872
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+if [ -z "$LANG" ]; then
+  if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then
+    . "$XDG_CONFIG_HOME/locale.conf"
+  elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then
+    . "$HOME/.config/locale.conf"
+  elif [ -r /etc/locale.conf ]; then
+    . /etc/locale.conf
+  fi
+fi
+
+LANG=${LANG:-C}
+export LANG
+[ -n "$LC_CTYPE" ]          && export LC_CTYPE
+[ -n "$LC_NUMERIC" ]        && export LC_NUMERIC
+[ -n "$LC_TIME" ]           && export LC_TIME
+[ -n "$LC_COLLATE" ]        && export LC_COLLATE
+[ -n "$LC_MONETARY" ]       && export LC_MONETARY
+[ -n "$LC_MESSAGES" ]       && export LC_MESSAGES
+[ -n "$LC_PAPER" ]          && export LC_PAPER
+[ -n "$LC_NAME" ]           && export LC_NAME
+[ -n "$LC_ADDRESS" ]        && export LC_ADDRESS
+[ -n "$LC_TELEPHONE" ]      && export LC_TELEPHONE
+[ -n "$LC_MEASUREMENT" ]    && export LC_MEASUREMENT
+[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION

package/systemd/systemd.mk +7 -1

index 92f99c2..ef14c76 100644
@@ -158,6 +158,12 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK
        touch $(TARGET_DIR)/etc/machine-id
 endef
 
+define SYSTEMD_INSTALL_LOCALE_SH_HOOK
+       mkdir -p $(TARGET_DIR)/etc/profile.d
+       $(INSTALL) -D -m 644 package/systemd/locale.sh \
+               $(TARGET_DIR)/etc/profile.d/locale.sh
+endef
+
 define SYSTEMD_SANITIZE_PATH_IN_UNITS
        find $(TARGET_DIR)/lib/systemd/system -name '*.service' \
                -exec $(SED) 's,$(HOST_DIR),,g' {} \;

@@ -172,6 +178,7 @@ endef
 SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
        SYSTEMD_INSTALL_INIT_HOOK \
        SYSTEMD_INSTALL_MACHINEID_HOOK \
+       SYSTEMD_INSTALL_LOCALE_SH_HOOK \
        SYSTEMD_INSTALL_RESOLVCONF_HOOK \
        SYSTEMD_DISABLE_LDCONFIG_SERVICE_HOOK \
        SYSTEMD_SANITIZE_PATH_IN_UNITS
--

2.2.1

Quoted 4 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Regards,

--
Samuel

From: Maxim Mikityanskiy <[email protected]>

Add /etc/profile.d/locale.sh script from Arch Linux to /etc/profile. This script looks for locale.conf, sources it, and exports the LANG and LC_* variables.

[Arnout: put in /etc/profile in the skeleton rather than making it
systemd specific.]

Signed-off-by Maxim Mikityanskiy <[email protected]>

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
v2 [Arnout]: make the modification to /etc/profile in the skeleton rather than something systemd-specific - proposed by Samuel Martin.

---
 system/skeleton/etc/profile | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

Install alternative symlinks for dosfstools mkfs.fat, fsck.fat and fatlabel. Those symlinks are generally installed by make install, but buildroot does not use make install for dosfstools, but symlinks should be installed anyway.

Signed-off-by Maxim Mikityanskiy <[email protected]>

Install alternative symlinks for dosfstools mkfs.fat, fsck.fat and fatlabel. Those symlinks are generally installed by make install, but buildroot does not use make install for dosfstools, but symlinks should be installed anyway.

Signed-off-by Maxim Mikityanskiy <[email protected]>

The place for package-provided systemd units is /lib/systemd/system. /etc/systemd/system is for custom units.

---
 package/dropbear/dropbear.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

package/dropbear/dropbear.mk +0 -0

index 696095d..2230c61 100644

package/dropbear/dropbear.mk +0 -1

 endef
 
--

2.2.1

The place for package-provided systemd units is /lib/systemd/system. /etc/systemd/system is for custom units.

---
 package/dropbear/dropbear.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

systemd looks for fsck in /sbin, so make symlink:
/sbin/fsck -> /usr/sbin/fsck

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/e2fsprogs/e2fsprogs.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

package/e2fsprogs/e2fsprogs.mk +8 -1

index b4f0950..9f0310d 100644
@@ -117,5 +117,13 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_FINDFS),y)
 E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FINDFS_SYMLINK
 endif
 
+define E2FSPROGS_TARGET_FSCK_SYMLINK
+       ln -sf ../usr/sbin/fsck $(TARGET_DIR)/sbin/fsck
+endef
+
+ifeq ($(BR2_PACKAGE_E2FSPROGS_FSCK),y)
+E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FSCK_SYMLINK
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
--

2.2.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

systemd looks for fsck in /sbin, so make symlink:
/sbin/fsck -> /usr/sbin/fsck

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/e2fsprogs/e2fsprogs.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

Support running minidlna in system-wide mode using systemd:

1. Set --with-db-path and --with-log-path configure options to make default minidlna directories comply with FHS.

2. Install suitable minidlna.conf for system-wide mode.

3. Install sysctl.d config file to increase inotify watches count.

4. Install tmpfiles.d config file to mkdir and chmod necessary directories for minidlna running in system-wide mode.

5. Install sysusers.d config file to create minidlna user when using systemd.

6. Install minidlna.service for systemd.

Note: User=minidlna should be set in minidlna.service, not in minidlna.conf, because minidlna is unable to drop privileges correctly by itself: it does not get any privileges provided by groups of minidlna user. Systemd drops privileges correctly in that case.

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/minidlna/minidlna.conf          | 74 +++++++++++++++++++++++++++++++++
 package/minidlna/minidlna.mk            | 37 +++++++++++++++++
 package/minidlna/minidlna.service       | 12 ++++++
 package/minidlna/minidlna_sysctl.conf   |  1 +
 package/minidlna/minidlna_sysusers.conf |  1 +
 package/minidlna/minidlna_tmpfiles.conf |  3 ++
 6 files changed, 128 insertions(+)
 create mode 100644 package/minidlna/minidlna.conf
 create mode 100644 package/minidlna/minidlna.service
 create mode 100644 package/minidlna/minidlna_sysctl.conf
 create mode 100644 package/minidlna/minidlna_sysusers.conf
 create mode 100644 package/minidlna/minidlna_tmpfiles.conf

package/minidlna/minidlna.conf new file +64 -0

new file mode 100644
index 0000000..9e4fbc9
@@ -0,0 +1,74 @@
+# port for HTTP (descriptions, SOAP, media transfer) traffic
+port=8200
+
+# network interfaces to serve, comma delimited
+#network_interface=eth0
+
+# set this to the directory you want scanned.
+# * if you want multiple directories, you can have multiple media_dir= lines
+# * if you want to restrict a media_dir to specific content types, you
+#   can prepend the types, followed by a comma, to the directory:
+#   + "A" for audio  (eg. media_dir=A,/home/jmaggard/Music)
+#   + "V" for video  (eg. media_dir=V,/home/jmaggard/Videos)
+#   + "P" for images (eg. media_dir=P,/home/jmaggard/Pictures)
+#   + "PV" for pictures and video (eg. media_dir=PV,/home/jmaggard/digital_camera)
+#media_dir=/home
+
+# set this to merge all media_dir base contents into the root container
+# note: the default is no
+#merge_media_dirs=no
+
+# set this if you want to customize the name that shows up on your clients
+friendly_name=Buildroot DLNA Server
+
+# set this to change the verbosity of the information that is logged
+# each section can use a different level: off, fatal, error, warn, info, or debug
+#log_level=general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn
+
+# this should be a list of file names to check for when searching for album art
+# note: names should be delimited with a forward slash ("/")
+album_art_names=Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg/AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg/Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg
+
+# set this to no to disable inotify monitoring to automatically discover new files
+# note: the default is yes
+inotify=yes
+
+# set this to yes to enable support for streaming .jpg and .mp3 files to a TiVo supporting HMO
+enable_tivo=no
+
+# set this to strictly adhere to DLNA standards.
+# * This will allow server-side downscaling of very large JPEG images,
+#   which may hurt JPEG serving performance on (at least) Sony DLNA products.
+strict_dlna=no
+
+# default presentation url is http address on port 80
+#presentation_url=http://www.mylan/index.php
+
+# notify interval in seconds. default is 895 seconds.
+notify_interval=900
+
+# serial and model number the daemon will report to clients
+# in its XML description
+serial=12345678
+model_number=1
+
+# specify the path to the MiniSSDPd socket
+#minissdpdsocket=/var/run/minissdpd.sock
+
+# use different container as root of the tree
+# possible values:
+#   + "." - use standard container (this is the default)
+#   + "B" - "Browse Directory"
+#   + "M" - "Music"
+#   + "V" - "Video"
+#   + "P" - "Pictures"

package/minidlna/minidlna.mk +17 -0

index bcbe5fa..fcc9d06 100644
@@ -24,4 +24,41 @@ MINIDLNA_CONF_OPTS = \
        --disable-static
 endif
 
+MINIDLNA_CONF_OPTS += \
+       --with-db-path=/var/cache/minidlna \
+       --with-log-path=/var/log/minidlna
+
+define MINIDLNA_INSTALL_CONF_HOOK
+       $(INSTALL) -D -m 644 package/minidlna/minidlna.conf \
+               $(TARGET_DIR)/etc/minidlna.conf
+endef
+
+define MINIDLNA_INSTALL_SYSUSERS_HOOK
+       $(INSTALL) -D -m 644 package/minidlna/minidlna_sysusers.conf \
+               $(TARGET_DIR)/usr/lib/sysusers.d/minidlna.conf
+endef
+
+define MINIDLNA_INSTALL_TMPFILES_HOOK
+       $(INSTALL) -D -m 644 package/minidlna/minidlna_tmpfiles.conf \
+               $(TARGET_DIR)/usr/lib/tmpfiles.d/minidlna.conf

package/minidlna/minidlna.mk +7 -0

+endif
+
+define MINIDLNA_INSTALL_INIT_SYSTEMD
+       $(INSTALL) -D -m 644 package/minidlna/minidlna.service \
+               $(TARGET_DIR)/lib/systemd/system/minidlna.service
+endef
+
 $(eval $(autotools-package))

package/minidlna/minidlna.service new file +12 -0

new file mode 100644
index 0000000..45b72f0
@@ -0,0 +1,12 @@
+[Unit]
+Description=minidlna server
+After=network.target
+
+[Service]
+User=minidlna
+Type=forking
+ExecStart=/usr/sbin/minidlnad -P /run/minidlna/minidlna.pid
+PIDFile=/run/minidlna/minidlna.pid
+
+[Install]
+WantedBy=multi-user.target

package/minidlna/minidlna_sysctl.conf new file +1 -0

new file mode 100644
index 0000000..0745b37
@@ -0,0 +1 @@
+fs.inotify.max_user_watches = 65536

package/minidlna/minidlna_sysusers.conf new file +1 -0

new file mode 100644
index 0000000..1dc06f3
@@ -0,0 +1 @@
+u minidlna - "DLNA server"

package/minidlna/minidlna_tmpfiles.conf new file +3 -1

new file mode 100644
index 0000000..a6e66e7
@@ -0,0 +1,3 @@
+d /var/run/minidlna 0755 minidlna minidlna -
+d /var/cache/minidlna 0700 minidlna minidlna -
+d /var/log/minidlna 0755 minidlna minidlna -
--

2.2.1

Hi Maxim,

Quoted 9 lines · Maxim Mikityanskiy

Support running minidlna in system-wide mode using systemd:

1. Set --with-db-path and --with-log-path configure options to make default minidlna directories comply with FHS.

2. Install suitable minidlna.conf for system-wide mode.

3. Install sysctl.d config file to increase inotify watches count.

Quoted 5 lines

4. Install tmpfiles.d config file to mkdir and chmod necessary directories for minidlna running in system-wide mode.

5. Install sysusers.d config file to create minidlna user when using systemd.

To make minidlna compliant with non-systemd ssytem, you should add the user using _USERS infra [1].

= 1000 are for real users. Systemd-sysusers, however, creates users

Quoted 99 lines

6. Install minidlna.service for systemd.

Note: User=minidlna should be set in minidlna.service, not in minidlna.conf, because minidlna is unable to drop privileges correctly by itself: it does not get any privileges provided by groups of minidlna user. Systemd drops privileges correctly in that case.

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/minidlna/minidlna.conf          | 74 +++++++++++++++++++++++++++++++++
 package/minidlna/minidlna.mk            | 37 +++++++++++++++++
 package/minidlna/minidlna.service       | 12 ++++++
 package/minidlna/minidlna_sysctl.conf   |  1 +
 package/minidlna/minidlna_sysusers.conf |  1 +
 package/minidlna/minidlna_tmpfiles.conf |  3 ++
 6 files changed, 128 insertions(+)
 create mode 100644 package/minidlna/minidlna.conf
 create mode 100644 package/minidlna/minidlna.service
 create mode 100644 package/minidlna/minidlna_sysctl.conf
 create mode 100644 package/minidlna/minidlna_sysusers.conf
 create mode 100644 package/minidlna/minidlna_tmpfiles.conf

package/minidlna/minidlna.conf new file +70 -0

new file mode 100644
index 0000000..9e4fbc9
@@ -0,0 +1,74 @@
+# port for HTTP (descriptions, SOAP, media transfer) traffic
+port=8200
+
+# network interfaces to serve, comma delimited
+#network_interface=eth0
+
+# set this to the directory you want scanned.
+# * if you want multiple directories, you can have multiple media_dir= lines
+# * if you want to restrict a media_dir to specific content types, you
+#   can prepend the types, followed by a comma, to the directory:
+#   + "A" for audio  (eg. media_dir=A,/home/jmaggard/Music)
+#   + "V" for video  (eg. media_dir=V,/home/jmaggard/Videos)
+#   + "P" for images (eg. media_dir=P,/home/jmaggard/Pictures)
+#   + "PV" for pictures and video (eg. media_dir=PV,/home/jmaggard/digital_camera)
+#media_dir=/home
+
+# set this to merge all media_dir base contents into the root container
+# note: the default is no
+#merge_media_dirs=no
+
+# set this if you want to customize the name that shows up on your clients
+friendly_name=Buildroot DLNA Server
+
+# set this to change the verbosity of the information that is logged
+# each section can use a different level: off, fatal, error, warn, info, or debug
+#log_level=general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn
+
+# this should be a list of file names to check for when searching for album art
+# note: names should be delimited with a forward slash ("/")
+album_art_names=Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg/AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg/Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg
+
+# set this to no to disable inotify monitoring to automatically discover new files
+# note: the default is yes
+inotify=yes
+
+# set this to yes to enable support for streaming .jpg and .mp3 files to a TiVo supporting HMO
+enable_tivo=no
+
+# set this to strictly adhere to DLNA standards.
+# * This will allow server-side downscaling of very large JPEG images,
+#   which may hurt JPEG serving performance on (at least) Sony DLNA products.
+strict_dlna=no
+
+# default presentation url is http address on port 80
+#presentation_url=http://www.mylan/index.php
+
+# notify interval in seconds. default is 895 seconds.
+notify_interval=900
+
+# serial and model number the daemon will report to clients
+# in its XML description
+serial=12345678
+model_number=1
+
+# specify the path to the MiniSSDPd socket
+#minissdpdsocket=/var/run/minissdpd.sock
+
+# use different container as root of the tree
+# possible values:
+#   + "." - use standard container (this is the default)
+#   + "B" - "Browse Directory"
+#   + "M" - "Music"
+#   + "V" - "Video"
+#   + "P" - "Pictures"
+#   + Or, you can specify the ObjectID of your desired root container (eg. 1$F for Music/Playlists)
+# if you specify "B" and client device is audio-only then "Music/Folders" will be used as root
+#root_container=.
+
+# always force SortCriteria to this value, regardless of the SortCriteria passed by the client
+#force_sort_criteria=+upnp:class,+upnp:originalTrackNumber,+dc:title

package/minidlna/minidlna.conf line 74

Quoted 4 lines

package/minidlna/minidlna.conf new file +4 -0

+
+# maximum number of simultaneous connections
+# note: many clients open several simultaneous connections while streaming
+#max_connections=50

We usually prefer minmal default configuration files, with only necessary stuff (i.e. no comments), letting the user browsing the package manual to set all config he/she needs.

Quoted 29 lines

package/minidlna/minidlna.mk +21 -0

index bcbe5fa..fcc9d06 100644
@@ -24,4 +24,41 @@ MINIDLNA_CONF_OPTS = \
        --disable-static
 endif
 
+MINIDLNA_CONF_OPTS += \
+       --with-db-path=/var/cache/minidlna \
+       --with-log-path=/var/log/minidlna
+
+define MINIDLNA_INSTALL_CONF_HOOK
+       $(INSTALL) -D -m 644 package/minidlna/minidlna.conf \
+               $(TARGET_DIR)/etc/minidlna.conf
+endef
+
+define MINIDLNA_INSTALL_SYSUSERS_HOOK
+       $(INSTALL) -D -m 644 package/minidlna/minidlna_sysusers.conf \
+               $(TARGET_DIR)/usr/lib/sysusers.d/minidlna.conf
+endef
+
+define MINIDLNA_INSTALL_TMPFILES_HOOK
+       $(INSTALL) -D -m 644 package/minidlna/minidlna_tmpfiles.conf \
+               $(TARGET_DIR)/usr/lib/tmpfiles.d/minidlna.conf
+endef
+
+define MINIDLNA_INSTALL_SYSCTL_HOOK
+       $(INSTALL) -D -m 644 package/minidlna/minidlna_sysctl.conf \

package/minidlna/minidlna.mk MINIDLNA_CONF_OPTS = \ · line 53

Quoted 6 lines

package/minidlna/minidlna.mk +6 -0

+               $(TARGET_DIR)/usr/lib/sysctl.d/20-minidlna.conf
+endef
+
+ifeq ($(BR2_INIT_SYSTEMD),y)
+MINIDLNA_POST_INSTALL_TARGET_HOOKS += \
+       MINIDLNA_INSTALL_CONF_HOOK \

This hook could be run even if init is not systemd, no?

package/minidlna/minidlna.mk MINIDLNA_CONF_OPTS = \ · line 56

Quoted 3 lines

package/minidlna/minidlna.mk +3 -0

+       MINIDLNA_INSTALL_SYSUSERS_HOOK \
+       MINIDLNA_INSTALL_TMPFILES_HOOK \
+       MINIDLNA_INSTALL_SYSCTL_HOOK

Maybe you could put all systemd stuff in 1 and single hook.

Quoted 50 lines

package/minidlna/minidlna.mk +7 -0

+endif
+
+define MINIDLNA_INSTALL_INIT_SYSTEMD
+       $(INSTALL) -D -m 644 package/minidlna/minidlna.service \
+               $(TARGET_DIR)/lib/systemd/system/minidlna.service
+endef
+
 $(eval $(autotools-package))

package/minidlna/minidlna.service new file +12 -0

new file mode 100644
index 0000000..45b72f0
@@ -0,0 +1,12 @@
+[Unit]
+Description=minidlna server
+After=network.target
+
+[Service]
+User=minidlna
+Type=forking
+ExecStart=/usr/sbin/minidlnad -P /run/minidlna/minidlna.pid
+PIDFile=/run/minidlna/minidlna.pid
+
+[Install]
+WantedBy=multi-user.target

package/minidlna/minidlna_sysctl.conf new file +1 -0

new file mode 100644
index 0000000..0745b37
@@ -0,0 +1 @@
+fs.inotify.max_user_watches = 65536

package/minidlna/minidlna_sysusers.conf new file +1 -0

new file mode 100644
index 0000000..1dc06f3
@@ -0,0 +1 @@
+u minidlna - "DLNA server"

package/minidlna/minidlna_tmpfiles.conf new file +3 -1

new file mode 100644
index 0000000..a6e66e7
@@ -0,0 +1,3 @@
+d /var/run/minidlna 0755 minidlna minidlna -
+d /var/cache/minidlna 0700 minidlna minidlna -
+d /var/log/minidlna 0755 minidlna minidlna -
--

Quoted 2 lines

2.2.1

[1] http://nightly.buildroot.org/manual.html#customize-users

Regards,

--
Samuel

Hi Samuel,

2015-02-02 23:12 GMT+02:00 Samuel Martin <[email protected]>:

Quoted 18 lines

Hi Maxim,

Quoted 14 lines · Maxim Mikityanskiy

Support running minidlna in system-wide mode using systemd:

1. Set --with-db-path and --with-log-path configure options to make default minidlna directories comply with FHS.

2. Install suitable minidlna.conf for system-wide mode.

3. Install sysctl.d config file to increase inotify watches count.

4. Install tmpfiles.d config file to mkdir and chmod necessary directories for minidlna running in system-wide mode.

5. Install sysusers.d config file to create minidlna user when using systemd.

Quoted 2 lines

To make minidlna compliant with non-systemd ssytem, you should add the user using _USERS infra [1].

There were two reasons I preferred sysusers over _USERS. At first, my patch only adds systemd unit file and doesn't add initscript for SysVinit-based systems.

So minidlna user will be useless on
non-systemd systems. At second, I've noticed that _USERS create users with UID >= 1000. UIDs < 1000 are reserved for system users, and UIDs

Quoted 1 line

= 1000 are for real users.

Systemd-sysusers, however, creates users
with UID < 1000. I think minidlna user should have UID < 1000. So should I really replace sysusers with _USERS for creating minidlna user here?

Quoted 11 lines

Quoted 11 lines

6. Install minidlna.service for systemd.

Note: User=minidlna should be set in minidlna.service, not in minidlna.conf, because minidlna is unable to drop privileges correctly by itself: it does not get any privileges provided by groups of minidlna user. Systemd drops privileges correctly in that case.

Signed-off-by Maxim Mikityanskiy <[email protected]>

---

Quoted 4 lines

We usually prefer minmal default configuration files, with only necessary stuff (i.e. no comments), letting the user browsing the package manual to set all config he/she needs.

OK, I'll consider it. This config has lots of comments because it's based on default one shipped with package.

Quoted 29 lines

Quoted 29 lines

package/minidlna/minidlna.mk +21 -0

index bcbe5fa..fcc9d06 100644
@@ -24,4 +24,41 @@ MINIDLNA_CONF_OPTS = \
        --disable-static
 endif
 
+MINIDLNA_CONF_OPTS += \
+       --with-db-path=/var/cache/minidlna \
+       --with-log-path=/var/log/minidlna
+
+define MINIDLNA_INSTALL_CONF_HOOK
+       $(INSTALL) -D -m 644 package/minidlna/minidlna.conf \
+               $(TARGET_DIR)/etc/minidlna.conf
+endef
+
+define MINIDLNA_INSTALL_SYSUSERS_HOOK
+       $(INSTALL) -D -m 644 package/minidlna/minidlna_sysusers.conf \
+               $(TARGET_DIR)/usr/lib/sysusers.d/minidlna.conf
+endef
+
+define MINIDLNA_INSTALL_TMPFILES_HOOK
+       $(INSTALL) -D -m 644 package/minidlna/minidlna_tmpfiles.conf \
+               $(TARGET_DIR)/usr/lib/tmpfiles.d/minidlna.conf
+endef
+
+define MINIDLNA_INSTALL_SYSCTL_HOOK
+       $(INSTALL) -D -m 644 package/minidlna/minidlna_sysctl.conf \

Quoted 8 lines

package/minidlna/minidlna.mk MINIDLNA_CONF_OPTS = \ · line 53

Quoted 6 lines

package/minidlna/minidlna.mk +6 -0

+               $(TARGET_DIR)/usr/lib/sysctl.d/20-minidlna.conf
+endef
+
+ifeq ($(BR2_INIT_SYSTEMD),y)
+MINIDLNA_POST_INSTALL_TARGET_HOOKS += \
+       MINIDLNA_INSTALL_CONF_HOOK \

This hook could be run even if init is not systemd, no?

It could be run, but it will be useless because there is no initscript for non-systemd systems anyway. Maybe I should resend this patch with initscript added.

Quoted 7 lines

package/minidlna/minidlna.mk MINIDLNA_CONF_OPTS = \ · line 56

Quoted 4 lines

package/minidlna/minidlna.mk +3 -0

+       MINIDLNA_INSTALL_SYSUSERS_HOOK \
+       MINIDLNA_INSTALL_TMPFILES_HOOK \
+       MINIDLNA_INSTALL_SYSCTL_HOOK

Maybe you could put all systemd stuff in 1 and single hook.

Quoted 8 lines

package/minidlna/minidlna.mk MINIDLNA_CONF_OPTS = \ · line 64

Quoted 8 lines

package/minidlna/minidlna.mk +7 -0

+endif
+
+define MINIDLNA_INSTALL_INIT_SYSTEMD
+       $(INSTALL) -D -m 644 package/minidlna/minidlna.service \
+               $(TARGET_DIR)/lib/systemd/system/minidlna.service
+endef
+
 $(eval $(autotools-package))

Quoted 2 lines

To make minidlna compliant with non-systemd ssytem, you should add the

Quoted 1 line

user using _USERS infra [1].

There were two reasons I preferred sysusers over _USERS.

Support running minidlna in system-wide mode using systemd:

1. Set --with-db-path and --with-log-path configure options to make default minidlna directories comply with FHS.

2. Install suitable minidlna.conf for system-wide mode.

3. Install sysctl.d config file to increase inotify watches count.

4. Install tmpfiles.d config file to mkdir and chmod necessary directories for minidlna running in system-wide mode.

5. Install sysusers.d config file to create minidlna user when using systemd.

6. Install minidlna.service for systemd.

Note: User=minidlna should be set in minidlna.service, not in minidlna.conf, because minidlna is unable to drop privileges correctly by itself: it does not get any privileges provided by groups of minidlna user. Systemd drops privileges correctly in that case.

Signed-off-by Maxim Mikityanskiy <[email protected]>

Support running transmission-daemon in system-wide mode using systemd:

1. Pass --with-systemd-daemon to configure script if systemd is enabled.

2. Install sysctl.d config file to increase send and receive buffer sizes.

3. Install tmpfiles.d config file to create transmission config directory.

4. Install sysusers.d config file to create transmission user when using systemd. Create transmission user when not using systemd.

5. Install transmission-daemon.service for systemd.

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/transmission/transmission-daemon.service | 12 +++++++
 package/transmission/transmission.mk             | 45 ++++++++++++++++++++++++
 package/transmission/transmission_sysctl.conf    |  2 ++
 package/transmission/transmission_sysusers.conf  |  1 +
 package/transmission/transmission_tmpfiles.conf  |  1 +
 5 files changed, 61 insertions(+)
 create mode 100644 package/transmission/transmission-daemon.service
 create mode 100644 package/transmission/transmission_sysctl.conf
 create mode 100644 package/transmission/transmission_sysusers.conf
 create mode 100644 package/transmission/transmission_tmpfiles.conf

package/transmission/transmission-daemon.service new file +12 -0

new file mode 100644
index 0000000..4e7c98b
@@ -0,0 +1,12 @@
+[Unit]
+Description=Transmission BitTorrent Daemon
+After=network.target
+
+[Service]
+User=transmission
+Type=notify
+ExecStart=/usr/bin/transmission-daemon -f --log-error -g /var/lib/transmission/config
+ExecReload=/bin/kill -s HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

package/transmission/transmission.mk +0 -0

index b8a5c42..b5b9c8b 100644

package/transmission/transmission.mk +31 -0

+endif
+
+ifeq ($(BR2_INIT_SYSTEMD),)
+define TRANSMISSION_USERS
+       transmission -1 transmission -1 * /var/lib/transmission - transmission Transmission Daemon
+endef
+endif
+
 define TRANSMISSION_INSTALL_INIT_SYSV
        $(INSTALL) -m 0755 -D package/transmission/S92transmission \
                $(TARGET_DIR)/etc/init.d/S92transmission
 endef
 
+define TRANSMISSION_INSTALL_INIT_SYSTEMD
+       $(INSTALL) -D -m 644 package/transmission/transmission-daemon.service \
+               $(TARGET_DIR)/lib/systemd/system/transmission-daemon.service
+       mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+       ln -fs /lib/systemd/system/transmission-daemon.service \
+               $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/transmission-daemon.service
+
+       mkdir -p $(TARGET_DIR)/var/lib/transmission/config
+endef
+
+define TRANSMISSION_INSTALL_SYSCTL_HOOK
+       $(INSTALL) -D -m 644 package/transmission/transmission_sysctl.conf \
+               $(TARGET_DIR)/usr/lib/sysctl.d/20-transmission.conf
+endef
+
+TRANSMISSION_POST_INSTALL_TARGET_HOOKS += \
+       TRANSMISSION_INSTALL_SYSCTL_HOOK
+
+define TRANSMISSION_INSTALL_TMPFILES_HOOK
+       $(INSTALL) -D -m 644 package/transmission/transmission_tmpfiles.conf \
+               $(TARGET_DIR)/usr/lib/tmpfiles.d/transmission.conf
+endef
+

package/transmission/transmission.mk +1 -0

+
 else
        TRANSMISSION_CONF_OPTS += --disable-daemon
 endif

package/transmission/transmission_sysctl.conf new file +2 -0

new file mode 100644
index 0000000..7862332
@@ -0,0 +1,2 @@
+net.core.wmem_max = 1048576
+net.core.rmem_max = 4194304

package/transmission/transmission_sysusers.conf new file +1 -0

new file mode 100644
index 0000000..09396d4
@@ -0,0 +1 @@
+u transmission - "Transmission daemon" /var/lib/transmission

package/transmission/transmission_tmpfiles.conf new file +1 -1

new file mode 100644
index 0000000..e40b94a
@@ -0,0 +1 @@
+d /var/lib/transmission/config 0700 transmission users -
--

2.2.1

We usually like when option are symetrical, so here, just add:
<snip>
else
TRANSMISSION_CONF_OPTS += --without-systemd-daemon </snip>

Note that, we usually don't indent variable assignation ;)

From: Maxim Mikityanskiy <[email protected]>

Support running transmission-daemon in system-wide mode using systemd:

1. Pass --with-systemd-daemon to configure script if systemd is enabled.

2. Install sysctl.d config file to increase send and receive buffer sizes.

3. Install sysusers.d config file to create transmission user when using systemd. Create transmission user when not using systemd.

4. Install transmission-daemon.service for systemd.

[Aur?lien : Fix symlink relative path, use upstream service file, no need for config path, and use transmission user in sysv script]

Signed-off-by Maxim Mikityanskiy <[email protected]>

Signed-off-by Aur?lien Chabot <[email protected]>

---
 package/transmission/S92transmission            |  4 +--
 package/transmission/transmission.mk            | 37 +++++++++++++++++++++++++
 package/transmission/transmission_sysctl.conf   |  2 ++
 package/transmission/transmission_sysusers.conf |  1 +
 4 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 package/transmission/transmission_sysctl.conf
 create mode 100644 package/transmission/transmission_sysusers.conf

package/transmission/S92transmission +1 -3

index 1870522..e5976b0 100644
@@ -24,9 +24,7 @@
 # by default, this is set to 'transmission'.
 # For the sake of security you shouldn't set a password
 # on this user
-#USERNAME=transmission
-USERNAME=default
-
+USERNAME=transmission
 
 
 # ----- *ADVANCED* CONFIGURATION -----

package/transmission/transmission.mk +11 -0

index bbc32bf..81dd110 100644
@@ -36,11 +36,48 @@ endif
 ifeq ($(BR2_PACKAGE_TRANSMISSION_DAEMON),y)
 TRANSMISSION_CONF_OPTS += --enable-daemon
 
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+TRANSMISSION_DEPENDENCIES += systemd
+TRANSMISSION_CONF_OPTS += --with-systemd-daemon
+else
+TRANSMISSION_CONF_OPTS += --without-systemd-daemon
+endif
+
+ifeq ($(BR2_INIT_SYSTEMD),)
+define TRANSMISSION_USERS
+       transmission -1 transmission -1 * /var/lib/transmission - transmission Transmission Daemon
+endef

package/transmission/transmission.mk +8 -0

+define TRANSMISSION_INSTALL_SYSUSERS_HOOK
+       $(INSTALL) -D -m 644 package/transmission/transmission_sysusers.conf \
+               $(TARGET_DIR)/usr/lib/sysusers.d/transmission.conf
+endef
+
+TRANSMISSION_POST_INSTALL_TARGET_HOOKS += \
+       TRANSMISSION_INSTALL_SYSUSERS_HOOK
+
 else
 TRANSMISSION_CONF_OPTS += --disable-daemon
 endif

package/transmission/transmission_sysctl.conf new file +0 -0

new file mode 100644
index 0000000..7862332

2.4.5

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Have you tested with a read-only file system ? Since /var/lib/transmission is not a tmpfs, I don't know if transmission will be very happy about that.

Quoted 4 lines · Maxime Hadjinlian

Have you tested with a read-only file system ? Since /var/lib/transmission is not a tmpfs, I don't know if transmission will be very happy about that.

From what I try, transmission doesn't crash or stop if it cannot write it's configuration. That's why I remove the tmpfs. Moreover the tmpfs stuff was only added for systemd, and if we choose to do that we should do the same for sysvinit.

I just saw a well that with systemd the folder /var/lib/transmission is not created, so I should have kept the line creating the folder. BTW, is it really the prefer solution to user sysuser.d instead of the buildroot user target ? Isn't this cause also problem on read only fs, because ets/passwd will not be writable ?

Aur?lien

From: Maxim Mikityanskiy <[email protected]>

Support running transmission-daemon in system-wide mode using systemd:

1. Pass --with-systemd-daemon to configure script if systemd is enabled.

2. Create the transmission user if having daemon

3. Install transmission-daemon.service for systemd.

[Aur?lien : Fix symlink relative path, use upstream service file, no need for config path, and use transmission user in sysv script, remove sysctl stuff]

Signed-off-by Maxim Mikityanskiy <[email protected]>

Signed-off-by Aur?lien Chabot <[email protected]>

---
 package/transmission/S92transmission |  4 +---
 package/transmission/transmission.mk | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

package/transmission/S92transmission +1 -3

index 1870522..e5976b0 100644
@@ -24,9 +24,7 @@
 # by default, this is set to 'transmission'.
 # For the sake of security you shouldn't set a password
 # on this user
-#USERNAME=transmission
-USERNAME=default
-
+USERNAME=transmission
 
 
 # ----- *ADVANCED* CONFIGURATION -----

package/transmission/transmission.mk +19 -1

index bbc32bf..efc00a1 100644
@@ -36,11 +36,30 @@ endif
 ifeq ($(BR2_PACKAGE_TRANSMISSION_DAEMON),y)
 TRANSMISSION_CONF_OPTS += --enable-daemon
 
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+TRANSMISSION_DEPENDENCIES += systemd
+TRANSMISSION_CONF_OPTS += --with-systemd-daemon
+else
+TRANSMISSION_CONF_OPTS += --without-systemd-daemon
+endif
+
+define TRANSMISSION_USERS
+       transmission -1 transmission -1 * /var/lib/transmission - transmission Transmission Daemon
+endef
+
 define TRANSMISSION_INSTALL_INIT_SYSV
        $(INSTALL) -m 0755 -D package/transmission/S92transmission \
                $(TARGET_DIR)/etc/init.d/S92transmission
 endef
 
+define TRANSMISSION_INSTALL_INIT_SYSTEMD
+       $(INSTALL) -D -m 0755 $(@D)/daemon/transmission-daemon.service \
+               $(TARGET_DIR)/usr/lib/systemd/system/transmission-daemon.service
+       mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+       ln -fs ../../../../usr/lib/systemd/system/transmission-daemon.service \
+               $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/transmission-daemon.service
+endef
+
 else
 TRANSMISSION_CONF_OPTS += --disable-daemon
 endif
--

2.4.6

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

From: Maxim Mikityanskiy <[email protected]>

Support running transmission-daemon in system-wide mode using systemd:

1. Pass --with-systemd-daemon to configure script if systemd is enabled.

2. Create the transmission user if having daemon

3. Install transmission-daemon.service for systemd.

[Aur?lien : Fix symlink relative path, use upstream service file, no need for config path, and use transmission user in sysv script, remove sysctl stuff]

Signed-off-by Maxim Mikityanskiy <[email protected]>

Signed-off-by Aur?lien Chabot <[email protected]>

---
 package/transmission/S92transmission |  4 +---
 package/transmission/transmission.mk | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Clean up system directories by making samba conform to FHS and by using subdirectories e.g. /var/log/samba and /var/run/samba instead of /var/log and /var/run.

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/samba/S91smb   |  5 +++--
 package/samba/samba.mk | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

package/samba/S91smb +3 -2

index c190771..2e03e82 100755
@@ -10,6 +10,7 @@
 mkdir -p /var/cache/samba
 mkdir -p /var/log/samba
 mkdir -p /var/lock/subsys
+mkdir -p /var/run/samba
 
 RETVAL=0
 

@@ -33,13 +34,13 @@ stop() {
        echo -n "Shutting down SMB services: "
        kill -9 `pidof smbd`
        RETVAL=$?
-       rm -f /var/run/smbd.pid
+       rm -f /var/run/samba/smbd.pid
        echo "done"
 
        echo -n "Shutting down NMB services: "
        kill -9 `pidof nmbd`
        RETVAL2=$?
-       rm -f /var/run/nmbd.pid
+       rm -f /var/run/samba/nmbd.pid
 
        [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb
        echo "done"

package/samba/samba.mk +5 -6

index d25e94e..31ad644 100644
@@ -33,11 +33,11 @@ SAMBA_CONF_ENV = \
        $(if $(BR2_PACKAGE_SAMBA_AVAHI),AVAHI_LIBS=-pthread)
 
 SAMBA_CONF_OPTS = \
-       --with-piddir=/var/run \
-       --with-lockdir=/var/lock \
-       --with-logfilebase=/var/log \
-       --with-configdir=/etc/samba \
-       --with-privatedir=/etc/samba \
+       --with-fhs \
+       --with-piddir=/var/run/samba \
+       --with-lockdir=/var/cache/samba \
+       --with-ncalrpcdir=/var/run/ncalrpc \
+       --with-nmbdsocketdir=/var/run/nmbd \
        \
        --disable-cups \
        --enable-shared-libs \
--

2.2.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Clean up system directories by making samba conform to FHS and by using subdirectories e.g. /var/log/samba and /var/run/samba instead of /var/log and /var/run.

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/samba/S91smb   |  5 +++--
 package/samba/samba.mk | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

Add {smbd,nmbd,winbindd}.service files for systemd. Add tmpfiles.d config file to create samba directories.

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/samba/nmbd.service        | 12 ++++++++++++
 package/samba/samba.mk            | 23 +++++++++++++++++++++++
 package/samba/samba_tmpfiles.conf |  4 ++++
 package/samba/smbd.service        | 12 ++++++++++++
 package/samba/winbindd.service    | 12 ++++++++++++
 5 files changed, 63 insertions(+)
 create mode 100644 package/samba/nmbd.service
 create mode 100644 package/samba/samba_tmpfiles.conf
 create mode 100644 package/samba/smbd.service
 create mode 100644 package/samba/winbindd.service

package/samba/nmbd.service new file +12 -0

new file mode 100644
index 0000000..6e241ea
@@ -0,0 +1,12 @@
+[Unit]
+Description=Samba NetBIOS name server
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/samba/nmbd.pid
+ExecStart=/usr/sbin/nmbd -D
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

package/samba/samba.mk +2 -0

index 31ad644..5a11ebe 100644
@@ -182,6 +182,29 @@ endef
 
 SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_CONFIG
 
+ifeq ($(BR2_INIT_SYSTEMD),y)
+define SAMBA_INSTALL_TMPFILES_HOOK

package/samba/samba.mk +3 -0

+       $(if $(BR2_PACKAGE_SAMBA_WINBINDD),ln -fs /lib/systemd/system/winbindd.service $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/winbindd.service)
+endef
+
 define SAMBA_INSTALL_INIT_SYSV
        $(INSTALL) -m 0755 -D package/samba/S91smb $(TARGET_DIR)/etc/init.d/S91smb
 endef

package/samba/samba_tmpfiles.conf new file +4 -0

new file mode 100644
index 0000000..e265f75
@@ -0,0 +1,4 @@
+d /var/cache/samba 0755 root root -
+d /var/log/samba 0755 root root -
+d /var/lock/samba 0755 root root -
+d /var/run/samba 0755 root root -

package/samba/smbd.service new file +12 -0

new file mode 100644
index 0000000..64abf56
@@ -0,0 +1,12 @@
+[Unit]
+Description=Samba SMB/CIFS server
+After=network.target nmbd.service winbindd.service
+
+[Service]
+Type=forking
+PIDFile=/var/run/samba/smbd.pid
+ExecStart=/usr/sbin/smbd -D
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

package/samba/winbindd.service new file +12 -1

new file mode 100644
index 0000000..214c17e
@@ -0,0 +1,12 @@
+[Unit]
+Description=Samba Winbind daemon
+After=network.target nmbd.service
+
+[Service]
+Type=forking
+PIDFile=/var/run/samba/winbindd.pid
+ExecStart=/usr/sbin/winbindd -D
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
--

2.2.1

Hi Maxim,

Quoted 44 lines

Add {smbd,nmbd,winbindd}.service files for systemd. Add tmpfiles.d config file to create samba directories.

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/samba/nmbd.service        | 12 ++++++++++++
 package/samba/samba.mk            | 23 +++++++++++++++++++++++
 package/samba/samba_tmpfiles.conf |  4 ++++
 package/samba/smbd.service        | 12 ++++++++++++
 package/samba/winbindd.service    | 12 ++++++++++++
 5 files changed, 63 insertions(+)
 create mode 100644 package/samba/nmbd.service
 create mode 100644 package/samba/samba_tmpfiles.conf
 create mode 100644 package/samba/smbd.service
 create mode 100644 package/samba/winbindd.service

package/samba/nmbd.service new file +12 -0

new file mode 100644
index 0000000..6e241ea
@@ -0,0 +1,12 @@
+[Unit]
+Description=Samba NetBIOS name server
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/samba/nmbd.pid
+ExecStart=/usr/sbin/nmbd -D
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

package/samba/samba.mk +2 -0

index 31ad644..5a11ebe 100644
@@ -182,6 +182,29 @@ endef
 
 SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_CONFIG
 
+ifeq ($(BR2_INIT_SYSTEMD),y)
+define SAMBA_INSTALL_TMPFILES_HOOK

package/samba/samba.mk endef · line 196

Quoted 10 lines

package/samba/samba.mk +10 -0

+       $(INSTALL) -D -m 644 package/samba/samba_tmpfiles.conf \
+               $(TARGET_DIR)/usr/lib/tmpfiles.d/samba.conf
+endef
+
+SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_TMPFILES_HOOK
+endif
+
+define SAMBA_INSTALL_INIT_SYSTEMD
+       $(INSTALL) -D -m 644 package/samba/smbd.service \
+               $(TARGET_DIR)/lib/systemd/system/smbd.service

smbd can be disabled, so its *.service installation should be optional WRT its option.

package/samba/samba.mk endef · line 198

Quoted 2 lines

package/samba/samba.mk +2 -0

+       $(INSTALL) -D -m 644 package/samba/nmbd.service \
+               $(TARGET_DIR)/lib/systemd/system/nmbd.service

ditto for nmbd.

package/samba/samba.mk endef · line 202

Quoted 4 lines

package/samba/samba.mk +4 -0

+       $(if $(BR2_PACKAGE_SAMBA_WINBINDD),$(INSTALL) -D -m 644 package/samba/winbindd.service $(TARGET_DIR)/lib/systemd/system/winbindd.service)
+       mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+       ln -fs /lib/systemd/system/smbd.service \
+               $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/smbd.service

ditto

package/samba/samba.mk endef · line 204

Quoted 2 lines

package/samba/samba.mk +2 -0

+       ln -fs /lib/systemd/system/nmbd.service \
+               $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nmbd.service

ditto

Quoted 53 lines

package/samba/samba.mk +3 -0

+       $(if $(BR2_PACKAGE_SAMBA_WINBINDD),ln -fs /lib/systemd/system/winbindd.service $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/winbindd.service)
+endef
+
 define SAMBA_INSTALL_INIT_SYSV
        $(INSTALL) -m 0755 -D package/samba/S91smb $(TARGET_DIR)/etc/init.d/S91smb
 endef

package/samba/samba_tmpfiles.conf new file +4 -0

new file mode 100644
index 0000000..e265f75
@@ -0,0 +1,4 @@
+d /var/cache/samba 0755 root root -
+d /var/log/samba 0755 root root -
+d /var/lock/samba 0755 root root -
+d /var/run/samba 0755 root root -

package/samba/smbd.service new file +12 -0

new file mode 100644
index 0000000..64abf56
@@ -0,0 +1,12 @@
+[Unit]
+Description=Samba SMB/CIFS server
+After=network.target nmbd.service winbindd.service
+
+[Service]
+Type=forking
+PIDFile=/var/run/samba/smbd.pid
+ExecStart=/usr/sbin/smbd -D
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

package/samba/winbindd.service new file +12 -1

new file mode 100644
index 0000000..214c17e
@@ -0,0 +1,12 @@
+[Unit]
+Description=Samba Winbind daemon
+After=network.target nmbd.service
+
+[Service]
+Type=forking
+PIDFile=/var/run/samba/winbindd.pid
+ExecStart=/usr/sbin/winbindd -D
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
--

Quoted 1 line

2.2.1

Regards,

--
Samuel
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

If acl or attr is going to be installed, add support for them to tar.

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/tar/tar.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

Add more options to Config.in to allow optionally select or deselect util-linux tools.

Also fix s/BR2_PACKAGE_WDCTL/BR2_PACKAGE_UTIL_LINUX_WDCTL/

Add more options to Config.in to allow optionally select or deselect util-linux tools.

Also fix s/BR2_PACKAGE_WDCTL/BR2_PACKAGE_UTIL_LINUX_WDCTL/

Support /etc/vim/vimrc as system-wide vimrc file. Add some default sample vimrc.

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/vim/vim.mk | 11 +++++++++++
 package/vim/vimrc  | 14 ++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 package/vim/vimrc

package/vim/vim.mk +11 -0

index da84d14..992e41b 100644
@@ -28,6 +28,12 @@ VIM_CONF_OPTS = --with-tlib=ncurses --enable-gui=no --without-x
 VIM_LICENSE = Charityware
 VIM_LICENSE_FILES = README.txt
 
+define VIM_VIMRC_HOOK
+       echo '#define SYS_VIMRC_FILE "/etc/vim/vimrc"' >> $(@D)/src/feature.h
+endef
+
+VIM_PRE_CONFIGURE_HOOKS += VIM_VIMRC_HOOK
+
 define VIM_INSTALL_TARGET_CMDS
        cd $(@D)/src; \
                $(MAKE) DESTDIR=$(TARGET_DIR) installvimbin; \

@@ -51,6 +57,11 @@ define VIM_INSTALL_VI_SYMLINK
 endef
 VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_VI_SYMLINK
 
+define VIM_INSTALL_VIMRC
+       $(INSTALL) -D -m 644 package/vim/vimrc $(TARGET_DIR)/etc/vim/vimrc
+endef
+VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_VIMRC
+
 ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y)
 VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_RUNTIME_CMDS
 VIM_POST_INSTALL_TARGET_HOOKS += VIM_REMOVE_DOCS

package/vim/vimrc new file +14 -1

new file mode 100644
index 0000000..bfc2087
@@ -0,0 +1,14 @@
+set nocompatible
+
+set ai
+set background=dark
+set backspace=indent,eol,start
+set nomodeline
+set ruler
+
+set ignorecase smartcase incsearch hlsearch
+
+syntax on
+
+filetype plugin on
+filetype indent on
--

2.2.1

Support /etc/vim/vimrc as system-wide vimrc file. Add some default sample vimrc.

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/vim/vim.mk | 11 +++++++++++
 package/vim/vimrc  | 14 ++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 package/vim/vimrc

package/rng-tools/rngd-exit-code.patch new file +11 -0

@@ -0,0 +1,11 @@
+--- a/rngd.c
++++ b/rngd.c
+@@ -319,7 +319,7 @@ int main(int argc, char **argv)
+                       message(LOG_DAEMON|LOG_ERR,
+                               "Maybe RNG device modules are not loaded\n");
+               }
+-              return 1;
++              return 66;
+       }
+
+       if (arguments->verbose) {

package/rng-tools/rngd.service new file +9 -1

new file mode 100644
index 0000000..3bdc4c1
@@ -0,0 +1,9 @@
+[Unit]
+Description=Hardware RNG Entropy Gatherer Daemon
+
+[Service]
+ExecStart=/usr/sbin/rngd -f
+SuccessExitStatus=66
+
+[Install]
+WantedBy=multi-user.target
--

2.2.1

Add rngd.service for systemd. Also patch rngd with patch from Fedora to ignore failure if no hwrng present:
https://bugzilla.redhat.com/show_bug.cgi?id=892178

Signed-off-by Maxim Mikityanskiy <[email protected]>

---
 package/rng-tools/rng-tools.mk         |  8 ++++++++
 package/rng-tools/rngd-exit-code.patch | 11 +++++++++++
 package/rng-tools/rngd.service         |  9 +++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 package/rng-tools/rngd-exit-code.patch
 create mode 100644 package/rng-tools/rngd.service