Package: systemd
Version: 28-1
Severity: wishlist
Attached are two patches I used to get the debian branch from v28
on git.err.no to build and run so far well.
First is a patch for the build ( ie remove the rm of hwclock which is no more,
and add the tmpfiles.d to appropriate packages install file). This one looks
straightforward.
Second is patch to fix the init-functions, ie the end ";;" from the "case" was
before
the "if". I put if after to fix a bug in reload, namely:
/lib/lsb/init-functions: line 40: Erreur de syntaxe près du symbole inattendu «
[ »
(ie syntax error near unexpexted symbol "["). This one I am not confident about
the aim of
the initial code (as I have not read the full extract yet).
Still sending both.
Best regards,
Alban
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.39-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages systemd depends on:
ii initscripts 2.88dsf-13.10 scripts for initializing and shutt
ii libaudit0 1.7.13-1.1 Dynamic library for security audit
ii libc6 2.13-7 Embedded GNU C Library: Shared lib
ii libcap2 1:2.21-1 support for getting/setting POSIX.
ii libcryptsetup1 2:1.3.0-3 libcryptsetup shared library
ii libdbus-1-3 1.5.4-2 simple interprocess messaging syst
ii libpam0g 1.1.3-1 Pluggable Authentication Modules l
ii libselinux1 2.0.98-1+b1 SELinux runtime shared libraries
ii libudev0 171-1 libudev shared library
ii libwrap0 7.6.q-19 Wietse Venema's TCP wrappers libra
ii udev 171-1 /dev/ and hotplug management daemo
ii util-linux 2.19.1-1 Miscellaneous system utilities
Versions of packages systemd recommends:
ii libpam-systemd 28-1 system and service manager - PAM m
Versions of packages systemd suggests:
ii python 2.6.6-14 interactive high-level object-orie
ii systemd-gui 28-1 system and service manager - GUI
-- no debconf information
-- debsums errors found:
debsums: changed file /lib/lsb/init-functions (from systemd package)
diff --git a/debian/rules b/debian/rules
index 12faa0f..f7ad8cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ override_dh_install:
rm debian/tmp/usr/share/doc/systemd/LICENSE
rm debian/tmp/lib/security/pam_systemd.la
# udev already triggers hwclock during boot
- rm debian/tmp/etc/systemd/system/sysinit.target.wants/hwclock-load.service
+ #rm debian/tmp/etc/systemd/system/sysinit.target.wants/hwclock-load.service
rm debian/tmp/lib/systemd/system/sysinit.target.wants/systemd-vconsole-setup.service
dh_install -O--parallel --fail-missing
dh_install -plibpam-systemd debian/pam-configs /usr/share
diff --git a/debian/systemd-sysv.install b/debian/systemd-sysv.install
index 0f6f677..42694af 100644
--- a/debian/systemd-sysv.install
+++ b/debian/systemd-sysv.install
@@ -1,3 +1,4 @@
+usr/lib/tmpfiles.d/legacy.conf
usr/share/man/man8/telinit.8
usr/share/man/man1/init.1
usr/share/man/man8/runlevel.8
diff --git a/debian/systemd.install b/debian/systemd.install
index 8ab553b..cf78cfb 100644
--- a/debian/systemd.install
+++ b/debian/systemd.install
@@ -27,6 +27,8 @@ usr/share/doc
usr/share/pkgconfig
usr/share/polkit-1
usr/lib/systemd/user
+usr/lib/tmpfiles.d/systemd.conf
+usr/lib/tmpfiles.d/x11.conf
debian/init-functions lib/lsb
debian/lib-init-rw.automount lib/systemd/system/
debian/lib-init-rw.mount lib/systemd/system/
diff --git a/debian/init-functions b/debian/init-functions
index 492cad2..0340319 100644
--- a/debian/init-functions
+++ b/debian/init-functions
@@ -34,12 +34,12 @@ if [ -e /sys/fs/cgroup/systemd ] ; then
_use_systemctl=1
;;
esac
+ # Some services can't reload through the .service file,
+ # but can through the init script.
+ if [ "$(systemctl -p CanReload show $service 2>/dev/null)" = "CanReload=no" ] && "$1" = "reload"; then
+ _use_systemctl=0
+ fi
;;
- # Some services can't reload through the .service file,
- # but can through the init script.
- if [ "$(systemctl -p CanReload show $service 2>/dev/null)" = "CanReload=no" ] && "$1" = "reload"; then
- _use_systemctl=0
- fi
esac
else
export _SYSTEMCTL_SKIP_REDIRECT="true"
