forked from pool/systemd
Accepting request 69643 from Base:System
- remove policy filter OBS-URL: https://build.opensuse.org/request/show/69643 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=34
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
parent
c798fced5f
commit
8665e3aaa9
@ -6,24 +6,21 @@ Subject: [PATCH] Add bootsplash handling for password dialogs
|
||||
openSUSE uses bootsplash.org, so add a crude handling for setting the
|
||||
splash screen to verbose when a password is asked...
|
||||
---
|
||||
src/ask-password-api.c | 22 ++++++++++++++++++++++
|
||||
1 files changed, 22 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/src/ask-password-api.c b/src/ask-password-api.c
|
||||
index 9f7023e..2023441 100644
|
||||
index da967ab..b89bcea 100644
|
||||
--- a/src/ask-password-api.c
|
||||
+++ b/src/ask-password-api.c
|
||||
@@ -47,6 +47,9 @@ int ask_password_tty(
|
||||
int r, ttyfd = -1, notify = -1;
|
||||
struct pollfd pollfd[2];
|
||||
@@ -62,6 +62,9 @@ int ask_password_tty(
|
||||
bool reset_tty = false;
|
||||
bool silent_mode = false;
|
||||
bool dirty = false;
|
||||
+ bool splash_silent = false;
|
||||
+ FILE *procsplash = NULL;
|
||||
+ char *line = NULL;
|
||||
enum {
|
||||
POLL_TTY,
|
||||
POLL_INOTIFY
|
||||
@@ -90,6 +93,19 @@ int ask_password_tty(
|
||||
@@ -105,6 +108,19 @@ int ask_password_tty(
|
||||
}
|
||||
|
||||
reset_tty = true;
|
||||
@ -43,7 +40,7 @@ index 9f7023e..2023441 100644
|
||||
}
|
||||
|
||||
zero(pollfd);
|
||||
@@ -201,6 +217,12 @@ finish:
|
||||
@@ -239,6 +255,12 @@ finish:
|
||||
close_nointr_nofail(ttyfd);
|
||||
}
|
||||
|
||||
@ -56,6 +53,3 @@ index 9f7023e..2023441 100644
|
||||
return r;
|
||||
}
|
||||
|
||||
--
|
||||
1.7.3.1
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9267127955ed9afbb41e1568c0db1e7028f6450993876a42e91a621fa04e5b5d
|
||||
size 754679
|
||||
3
systemd-26.tar.bz2
Normal file
3
systemd-26.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:25664ed77371f1c168267b1a3c2c7eb428981acc2a887b267a7deeff626a7c25
|
||||
size 816555
|
||||
393
systemd.changes
393
systemd.changes
@ -1,5 +1,396 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 8 19:06:45 UTC 2011 - kasievers@novell.com
|
||||
Thu May 5 07:45:46 UTC 2011 - coolo@opensuse.org
|
||||
|
||||
- remove policy filter
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 5 08:59:46 CEST 2011 - meissner@suse.de
|
||||
|
||||
- add missing buildrequires dbus-1-devel, vala, libxslt-devel
|
||||
- touch vala files for rebuilding to unbreak Factory
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 2 23:05:35 CEST 2011 - kay.sievers@novell.com
|
||||
|
||||
- also delete plymouth files
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 2 19:00:41 CEST 2011 - kay.sievers@novell.com
|
||||
|
||||
- disable plymouth sub-package until plymouth gets into Factory
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 1 22:51:28 CEST 2011 - kay.sievers@novell.com
|
||||
|
||||
- new snapshot
|
||||
- binfmt, modules-load, sysctl, tmpfiles: add missing
|
||||
ConditionDirectoryNotEmpty=
|
||||
- binfmt, modules-load, sysctl, tmpfiles: read /usr/local/lib
|
||||
and where appropriate /lib directories
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 30 04:56:55 CEST 2011 - kay.sievers@novell.com
|
||||
|
||||
- version 26
|
||||
- plymouth: introduce plymouth.enable=0 kernel command line
|
||||
- util: don't AND cx with cx
|
||||
- man: typo in sd_daemon reference
|
||||
- util: conf_files_list() return list as parameter
|
||||
- dbus: make daemon reexecution synchronous
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 28 14:07:12 CEST 2011 - kay.sievers@novell.com
|
||||
|
||||
- new snapshot
|
||||
- service: properly notice when services with a main process
|
||||
that isn't a child of init die
|
||||
- unit: fix assert when trying to load unit instances for
|
||||
uninstanciable types
|
||||
- def: lower default timeout to 90s
|
||||
- manager: fix serialization counter
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 27 04:19:05 CEST 2011 - kay.sievers@novell.com
|
||||
|
||||
- new snapshot
|
||||
- dbus: don't hit assert when dumping properties
|
||||
- cryptsetup: fix keyfile size option processing
|
||||
- socket: improve warning message when we get POLLHUP
|
||||
- mount: failure to mount cgroup hierarchies should not be fatal
|
||||
- configure: add AC_SYS_LARGEFILE
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 25 21:45:02 CEST 2011 - kay.sievers@novell.com
|
||||
|
||||
- new snapshot
|
||||
- tmpfiles.d: switch to stacked config dirs in /lib, /etc, /run
|
||||
- sysctl.d, binfmt.d, modules-load.d: switch to stacked config
|
||||
dirs in /lib, /etc, /run
|
||||
- manager: mkdir /run/systemd/system when starting up
|
||||
- man: Spelling fixes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 21 04:39:57 CEST 2011 - kay.sievers@novell.com
|
||||
|
||||
- version 25
|
||||
- mount: Allow creating mount units for /var/lib/nfs/rpc_pipefs
|
||||
and /proc/fs/nfsd.
|
||||
- socket: support ListeSpecial= sockets
|
||||
- vconsole: don't set console font/keymap if settings are empty
|
||||
- nspawn: don't fail when we receive SIGCHLD
|
||||
- cgroup: don't accidentaly trim on reload
|
||||
- units: set capability bounding set for syslog services
|
||||
- socket: log more information about invalid poll events
|
||||
- man: fix specification of default timeouts
|
||||
- mount,crypto: rework meaning of noauto/nofail
|
||||
- fsck: don't fsck against basic.target in order to properly
|
||||
allow automount /home
|
||||
- manager: when running in test mode, do not write generated
|
||||
unit files to /run/systemd/generator
|
||||
- mount: properly parse timeouts options in the middle of
|
||||
the string
|
||||
- hostnamed: drop all caps but CAP_SYS_ADMIN
|
||||
- execute: when we run as PID 1 the kernel doesn't give us
|
||||
CAP_SETPCAP by default. Get that temporarily when dropping
|
||||
capabilities for good
|
||||
- mount: make device timeout configurable
|
||||
- cryptsetup: do not order crypto DM devices against the
|
||||
cryptsetup service
|
||||
- socket: reuse existing FIFOs
|
||||
- socket: guarantee order in which sockets are passed to be
|
||||
the one of the configuration file
|
||||
- systemctl: always consider unit files with no
|
||||
[Install] section but stored in /lib enabled
|
||||
- job: also print status messages when we successfully started
|
||||
a unit
|
||||
- hostnamed: add reference to SMBIOS specs
|
||||
- man: runlevel 5 is usually more comprehensive, so use it
|
||||
instead of 3 to detect whether a sysv service is enabled
|
||||
- polkit: follow the usual syntax for polkit actions
|
||||
- hostnamed: introduce systemd-hostnamed
|
||||
- units: order quotacheck after remount-rootfs
|
||||
- hostname: split out hostname validation into util.c
|
||||
- dbus: split out object management code into dbus-common,
|
||||
and simplify it
|
||||
- strv: properly override settings in env_append()
|
||||
- strv: detect non-assignments in env blocks properly in
|
||||
env_append()
|
||||
- strv: handle empty lists in strv_copy() properly
|
||||
- util: truncate newline inside of read_one_line_file()
|
||||
- util: modernize get_parent_of_pid() a bit
|
||||
- crypto: let the cryptsetup binary handles its own
|
||||
configurable timeouts
|
||||
- logger,initctl: use global exit timeout
|
||||
- ask-password: use default timeout
|
||||
- manager: drop all pending jobs when isolating
|
||||
- manager: introduce IgnoreOnIsolate flag so that we can keep
|
||||
systemd-logger around when isolating
|
||||
- units: never pull in sysinit from utmp, so that we can
|
||||
shutdown from emergency mode without pulling in sysinit
|
||||
- manager: downgrade a few log messages
|
||||
- units: require syslog.socket from the logger because we
|
||||
simply fail if we don't have it
|
||||
- logger: adjust socket description to match service
|
||||
- units: set stdout of kmsg syslogd to /dev/null
|
||||
- units: add --no-block when starting normal service after
|
||||
shell exited
|
||||
- ask-password: use kill(PID, 0) before querying a password
|
||||
- ask-password: support passwords without timeouts
|
||||
- ask-password: always send final NUL char
|
||||
- ask-password: properly accept empty passwords from agent
|
||||
- unit: skip default cgroup setup if we have no hierarchy
|
||||
- units: isolate emergency.target instead of emergency.service
|
||||
when we fail to mount all file systems
|
||||
- mount: don't pull in stdio logger for root mount unit
|
||||
- cgroup: be nice to Ingo Molnar
|
||||
- pam: use /proc/self/sessionid only with CAP_AUDIT_CONTROL
|
||||
- pam: use /proc/self/loginuid only with CAP_AUDIT_CONTROL
|
||||
- socket: try creating a socket under our own identity if we
|
||||
have no perms to consult the selinux database
|
||||
- socket: fix check for SEQPACKET
|
||||
- execute: don't fail if we cannot fix OOM in a container
|
||||
- unit: fix dump output
|
||||
- socket: be a bit more verbose when refusing to start a
|
||||
socket unit
|
||||
- socket: support netlink sockets
|
||||
- local-fs: invoke emergency.service mounting at boot fails
|
||||
- path: optionally, create watched directories in .path units
|
||||
- tmpfiles: don't warn if two identical lines are configured
|
||||
- man: add man page for ask-password
|
||||
- dbus: expose monotonic timestamps on the bus
|
||||
- manager: no need to use randomized generator dir when running
|
||||
as system manager
|
||||
- don't make up buffer sizes, use standard LINE_MAX instead
|
||||
- unit: disallow configuration of more than one on_failure
|
||||
dependencies if OnFailureIsolate= is on
|
||||
- unit: pull in logger unit only when running in system mode
|
||||
- manager: serialize/deserialize max job id and /usr taint flag
|
||||
- manager: don't garbage collect jobs when isolating, to change
|
||||
global state
|
||||
- unit: introduce OnFailureIsolate=
|
||||
- mount: relabel both before and after a mount, just in case
|
||||
- cmdline: we actually want to parse the kernel cmdline in VMs,
|
||||
just not in containers
|
||||
- units: rename rtc-set.target to time-sync.target and pull it
|
||||
in by hwclock-load.service
|
||||
- job: fix deserialization of jobs: do not ignore ordering
|
||||
- systemctl: properly parse JobNew signals
|
||||
- service: fix units with more than one socket
|
||||
- systemctl: make most operations NOPs in a chroot
|
||||
- manager: don't show PID for incoming signals if it is 0
|
||||
- man: fix description of systemctl reload-or-try-restart
|
||||
- mount: block creation of mount units for API file systems
|
||||
- units: call the logger a bridge too
|
||||
- build-sys: always place user units in /usr/lib/systemd
|
||||
- pkgconfig: update .pc file accordingly
|
||||
- lookup: always also look into /usr/lib for units
|
||||
- exec: support unlimited resources
|
||||
- selinux: relabel /run the same way as /dev after loading
|
||||
the policy since they both come pre-filled and unlabelled
|
||||
- manager: fd must be int, not char
|
||||
- change remaining /var/run to /run
|
||||
- units: move user units from /usr/share to /usr/lib since
|
||||
they might be arch-dependent
|
||||
- man: document /etc/sysctl.d/
|
||||
- binfmt: add binfmt tool to set up binfmt_misc at boot
|
||||
- tmpfiles: create leading directories for d/D instructions
|
||||
- condition: add ConditionSecurity
|
||||
- load-fragment: unify config_parse_condition_{kernel, virt}
|
||||
- condition: fix dumping of conditions
|
||||
- initctl: /dev/initctl is a named pipe, not a socket
|
||||
- kmsg-syslogd: pass facility value into kmsg
|
||||
- move /var/lock to HAVE_SYSV_COMPAT
|
||||
- tmpfiles: split off rules for legacy systems into legacy.conf
|
||||
- general: replace a few uses of /var/run by /run
|
||||
- tmpfiles: enforce new /var/lock semantics
|
||||
- man: document ConditionPathIsDirectory=
|
||||
- mount: also relabel pre-mounted API dirs
|
||||
- log: don't strip facility when writing to kmsg
|
||||
- build-sys: create a number of drop-in config dirs
|
||||
- random: do not print warning if random seed doesn't exist
|
||||
- plymouth: use PID file to detect whether ply is running
|
||||
- build-sys: install systemd-analyze by default
|
||||
- analyze: improve output
|
||||
- analyze: add plotter
|
||||
- unit: when deserializing do reconnect to dbus/syslog when
|
||||
they show up
|
||||
- analyze: beautify output a bit
|
||||
- add systemd-analyze tool
|
||||
- unit: don't override timestamps due to state changes when
|
||||
deserializing
|
||||
- plymouth: don't explicitly enable status message when
|
||||
plymouth is up
|
||||
- status: show status messages unconditionally if plymouth
|
||||
is around
|
||||
- taint: add missing cgroups taint flag
|
||||
- locale: don't access misinitialized variable
|
||||
- quota: do not pull in quota tools for mounts that do not
|
||||
originate in neither /etc/fstab nor fragment files
|
||||
- manager: fix taint check for /usr
|
||||
- unit: never apply /etc/rcN.d/ priority to native services
|
||||
- unit: fix parsing of condition-result
|
||||
- unit: don't complain about failed units when deserializing
|
||||
- exec: drop process group kill mode since it has little use
|
||||
and confuses the user
|
||||
- cgroup: explain when we cannot initialize the cgroup stuff
|
||||
- systemctl: don't truncate description when using pager
|
||||
- ask-password: also accept Backspace as first keypress as
|
||||
silent mode switch
|
||||
- unit: when deserializing jobs, don't pull in dependencies
|
||||
- locale: fix LC_MESSAGES variable name
|
||||
- plymouth: Remove the calls to plymouth message
|
||||
- udev: systemd-tag all ttys
|
||||
- tmpfiles fix /run/lock permissions
|
||||
- ask-password: use TAB to disable asterisk password echo
|
||||
- execute: socket isn't abstract anymore
|
||||
- use /run instead of /dev/.run
|
||||
- man: explain a couple of default dependencies
|
||||
- mount: pull in quota services from local mountpoints with
|
||||
usr/grpquota options
|
||||
- service: pull in sysv facility targets from the sysv units,
|
||||
not the other way round
|
||||
- units: pull in syslog.target from syslog.socket
|
||||
- units: don't ever pull in SysV targets from other SysV
|
||||
targets
|
||||
- units: document that some targets exists only for compat
|
||||
with SysV
|
||||
- man: document pidns containers
|
||||
- units: deemphesize Names= settings, and explain why nobody
|
||||
whould use them
|
||||
- units: on mandriva/fedora create single.service alias via
|
||||
symlink, not Names=
|
||||
- units: get rid of runlevel Names=, the symlinks in
|
||||
/lib/systemd/system are much more useful
|
||||
- rework syslog detection so that we need no compile-time
|
||||
option what the name of the syslog implementation is
|
||||
- man: document .requires/ directories
|
||||
- special: get rid of dbus.target
|
||||
- exec: properly apply capability bounding set, add inverted
|
||||
bounding sets
|
||||
- dbus: add service D-Bus property "Sockets"
|
||||
- dbus: consolidate service SysV conditionals
|
||||
- unit: serialize condition test results
|
||||
- def: centralize definition of default timeout in one place
|
||||
- chkconfig: check against runlevel 5 instead of 3, since it is
|
||||
a superset of the latter
|
||||
- systemctl: accept condstop as alias for stop
|
||||
- dbus: allow LoadUnit to unprivileged users
|
||||
- umount: make sure skip_ro is always correctly initialized
|
||||
- create /run (link it to /var/run)
|
||||
- refresh splash password patch
|
||||
- conflict with old mkinitrd version (we need /run)
|
||||
- conflict with old udev (we need /run)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 16 18:38:04 CET 2011 - kay.sievers@novell.com
|
||||
|
||||
- new snapshot
|
||||
- man: fix systemctl try-restart description
|
||||
- Add Frugalware display-manager service
|
||||
- main: revert recognition of "b" argument
|
||||
- main: interpret all argv[] arguments unconditionally when
|
||||
run in a container
|
||||
- loopback: downgrade an error to warning
|
||||
- nspawn: bind mount /etc/localtime
|
||||
- nspawn: make tty code more robust against closed/reopened
|
||||
/dev/console
|
||||
- util: make touched files non-writable by default
|
||||
- nspawn: allocate a new pty instead of passing ours through
|
||||
to avoid terminal settings chaos
|
||||
- main: parse the whole arv[] as kernel command line
|
||||
- main: check if we have a valid PID before getting the name
|
||||
- ask-password: reset signal mask after we are done
|
||||
- cgroup: don't recheck all the time whether the systemd
|
||||
hierarchy is mounted, to make strace outputs nicer and save
|
||||
a few stat()s
|
||||
- man: document systemd-nspawn
|
||||
- cgls: don't strip user processes and kernel threads from
|
||||
default output
|
||||
- umount: don't try to remount bind mounts ro during shutdown
|
||||
- getty: move automatic serial getty logic into generator
|
||||
- container: skip a few things when we are run in a container
|
||||
such as accessing /proc/cmdline
|
||||
- cgls: by default start with group of PID 1
|
||||
- pam: determine user cgroup tree from cgroup of PID 1
|
||||
- nspawn: move container into its own name=systemd cgroup
|
||||
- manager: don't show kernel boot-up time for containers
|
||||
- manager: show who killed us
|
||||
- units: add console-shell.service which can be used insted of
|
||||
the gettys to get a shell on /dev/console
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 14 18:29:23 CET 2011 - kay.sievers@novell.com
|
||||
|
||||
- new snapshot
|
||||
- build-sys: move remaining tools from sbin/ to bin/ since they
|
||||
might eventually be useful for user execution
|
||||
- hostname: don't override the hostname with localhost if it
|
||||
is already set and /etc/hostname unset
|
||||
- audit: give up sending auditing messages when it failed due
|
||||
to EPERM
|
||||
- nspawn: don't require selinux on if it is compiled in
|
||||
- main: remove AF_UNIX sockets before binding
|
||||
- shutdown: print a nice message when terminating a container
|
||||
- nspawn: mount /selinux if needed
|
||||
- shutdown: just call exit() if we are in a container
|
||||
- umount: assume that a non-existing /dev/loop device means it
|
||||
is already detached
|
||||
- socket: use 777 as default mode for sockets
|
||||
- main: log to the console in a container
|
||||
- main: don't parse /proc/cmdline in containers
|
||||
- util: add detect_container()
|
||||
- nspawn: reset environment and load login shell
|
||||
- core: move abstract namespace sockets to /dev/.run
|
||||
- nspawn: add simple chroot(1) like tool to execute commands
|
||||
in a namespace container
|
||||
- util: return exit status in wait_for_terminate_and_warn()
|
||||
- util: properly identify pty devices by their major
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 12 14:26:28 CET 2011 - kay.sievers@novell.com
|
||||
|
||||
- new snapshot
|
||||
- polkit: autogenerate polkit policy with correct paths
|
||||
- systemctl: support remote and privileged systemctl access
|
||||
via SSH and pkexec
|
||||
- gnome-ask-password-agent: fix path to watch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 11 13:59:34 CET 2011 - kay.sievers@novell.com
|
||||
|
||||
- fix broken sysctl.service linking
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 11 01:39:41 CET 2011 - kay.sievers@novell.com
|
||||
|
||||
- new snapshot
|
||||
- units: move the last flag files to /dev/.run
|
||||
- util: close all fds before freezing execution
|
||||
- dbus: timeout connection setup
|
||||
- main: properly handle -b boot option
|
||||
- pam: do not leak file descriptor if flock fails
|
||||
- disable sysv services natively provided by systemd
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 10 14:16:50 CET 2011 - kay.sievers@novell.com
|
||||
|
||||
- new snapshot
|
||||
- main: refuse system to be started in a chroot
|
||||
- main: don't check if /usr really is a mount point, since it is
|
||||
fine if it is passed pre-mounted to us from the initrd
|
||||
- condition: take a timestamp and store last result of conditions
|
||||
- dev: use /dev/.run/systemd as runtime directory, instead of
|
||||
/dev/.systemd
|
||||
- machine-id: move machine-id-setup to /sbin
|
||||
- pkconfig: export full search path as .pc variable
|
||||
- selinux: bump up error level when in non-enforcing mode
|
||||
- dbus: fix dbus assert due to uninitialized error
|
||||
- dbus: properly generate UnknownInterface, UnknownProperty
|
||||
and PropertyReadOnly errors
|
||||
- mount: use /dev/.run as an early boot alias for /var/run
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 8 19:06:45 UTC 2011 - kay.sievers@novell.com
|
||||
|
||||
- version 20
|
||||
- service: prefix description with LSB only if script has LSB header,
|
||||
|
||||
85
systemd.spec
85
systemd.spec
@ -20,30 +20,36 @@
|
||||
|
||||
Name: systemd
|
||||
Url: http://www.freedesktop.org/wiki/Software/systemd
|
||||
Version: 20
|
||||
Version: 26
|
||||
Release: 1
|
||||
License: GPLv2+
|
||||
Group: System/Base
|
||||
Summary: A System and Session Manager
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: libudev-devel udev
|
||||
BuildRequires: libudev-devel udev dbus-1-devel
|
||||
BuildRequires: audit-devel
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: tcpd-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: libcryptsetup-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: gtk2-devel libnotify-devel
|
||||
BuildRequires: gtk2-devel libnotify-devel vala libxslt-devel
|
||||
BuildRequires: libselinux-devel libsepol-devel
|
||||
Requires: udev >= 164
|
||||
Requires: udev >= 167
|
||||
Requires: dbus-1 >= 1.4.0
|
||||
Requires: kbd
|
||||
Requires: util-linux >= 2.18.91
|
||||
Conflicts: mkinitrd < 2.6.0-5
|
||||
Requires: util-linux >= 2.19
|
||||
Conflicts: filesystem < 11.5
|
||||
Conflicts: mkinitrd < 2.7.0
|
||||
Source0: http://www.freedesktop.org/software/systemd/releases/%{name}-%{version}.tar.bz2
|
||||
Source1: systemd-rpmlintrc
|
||||
Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch
|
||||
|
||||
# Upstream First - Policy:
|
||||
# Never add any patches to this package without the upstream commit id
|
||||
# in the patch. Any patches added here without a very good reason to make
|
||||
# an exception will be silently removed with the next version update.
|
||||
|
||||
%description
|
||||
Systemd is a system and service manager, compatible with SysV and LSB
|
||||
init scripts for Linux. systemd provides aggressive parallelization
|
||||
@ -75,15 +81,15 @@ Conflicts: upstart
|
||||
%description sysvinit
|
||||
Drop-in replacement of System V init tools.
|
||||
|
||||
%package plymouth
|
||||
License: GPLv2+
|
||||
Group: System/Base
|
||||
Summary: Plymouth support for systemd
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: plymouth
|
||||
|
||||
%description plymouth
|
||||
Plymouth integration for systemd
|
||||
#%package plymouth
|
||||
#License: GPLv2+
|
||||
#Group: System/Base
|
||||
#Summary: Plymouth support for systemd
|
||||
#Requires: %{name} = %{version}-%{release}
|
||||
#Requires: plymouth
|
||||
#
|
||||
#%description plymouth
|
||||
#Plymouth integration for systemd
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
@ -100,6 +106,8 @@ export V=1
|
||||
--docdir=%{_docdir}/systemd \
|
||||
--with-rootdir= \
|
||||
CFLAGS="$RPM_OPT_FLAGS"
|
||||
# rebuild due to libnotify 0.7 in factory
|
||||
touch *.vala */*.vala
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
@ -115,7 +123,9 @@ ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/telinit
|
||||
ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/runlevel
|
||||
rm -rf $RPM_BUILD_ROOT/etc/systemd/system/*.target.wants
|
||||
rm -f $RPM_BUILD_ROOT/etc/systemd/system/default.target
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/modules-load.d
|
||||
rm -f $RPM_BUILD_ROOT/lib/systemd/system/plymouth-*.service
|
||||
rm -f $RPM_BUILD_ROOT/lib/systemd/system/*.wants/plymouth-*.service
|
||||
rm -f $RPM_BUILD_ROOT/lib/systemd/system/systemd-ask-password-plymouth.*
|
||||
# alias for /etc/init.d/*
|
||||
ln -s hwclock-load.service $RPM_BUILD_ROOT/lib/systemd/system/clock.service
|
||||
ln -s systemd-random-seed-load.service $RPM_BUILD_ROOT/lib/systemd/system/random.service
|
||||
@ -126,8 +136,15 @@ ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/earlysyslog.service
|
||||
ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/localfs.service
|
||||
ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/crypto-early.service
|
||||
ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/crypto.service
|
||||
ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/cgroup.service
|
||||
ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/klog.service
|
||||
ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/ldconfig.service
|
||||
ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/loadmodules.service
|
||||
ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/localnet.service
|
||||
ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/proc.service
|
||||
ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/swap.service
|
||||
|
||||
(cd $RPM_BUILD_ROOT && find . -name '*plymouth*') > files.plymouth
|
||||
#(cd $RPM_BUILD_ROOT && find . -name '*plymouth*') > files.plymouth
|
||||
|
||||
%post
|
||||
/bin/systemd-machine-id-setup >/dev/null 2>&1 || :
|
||||
@ -173,30 +190,42 @@ rm -rf $RPM_BUILD_ROOT
|
||||
/bin/systemd-tty-ask-password-agent
|
||||
/bin/systemd-tmpfiles
|
||||
/bin/systemd-machine-id-setup
|
||||
/usr/bin/systemd-nspawn
|
||||
/usr/bin/systemd-stdio-bridge
|
||||
/usr/bin/systemd-analyze
|
||||
%{_bindir}/systemd-cgls
|
||||
/lib/systemd/systemd-*
|
||||
%dir /lib/systemd/system-shutdown
|
||||
/%{_lib}/security/pam_systemd.so
|
||||
%dir %{_sysconfdir}/systemd/system
|
||||
%dir %{_sysconfdir}/systemd/user
|
||||
%dir %{_sysconfdir}/xdg/systemd
|
||||
%dir %{_sysconfdir}/xdg/systemd/user
|
||||
|
||||
%dir /usr/lib/modules-load.d
|
||||
%dir %{_sysconfdir}/modules-load.d
|
||||
%dir /usr/lib/tmpfiles.d
|
||||
%dir %{_sysconfdir}/tmpfiles.d
|
||||
%{_sysconfdir}/tmpfiles.d/*.conf
|
||||
%dir /usr/lib/binfmt.d
|
||||
%dir %{_sysconfdir}/binfmt.d
|
||||
%dir /usr/lib/sysctl.d
|
||||
%dir %{_sysconfdir}/sysctl.d
|
||||
/usr/lib/tmpfiles.d/*.conf
|
||||
%config(noreplace) %{_sysconfdir}/systemd/system.conf
|
||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf
|
||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf
|
||||
%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml
|
||||
%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
|
||||
%{_datadir}/polkit-1
|
||||
%{_datadir}/polkit-1/actions
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
|
||||
%{_datadir}/systemd
|
||||
%{_datadir}/pkgconfig/systemd.pc
|
||||
# Packaged in plymouth subpackage
|
||||
%exclude /lib/systemd/system/plymouth-*.service
|
||||
%exclude /lib/systemd/system/*.wants/plymouth-*.service
|
||||
%exclude /lib/systemd/system/systemd-ask-password-plymouth.*
|
||||
#%exclude /lib/systemd/system/plymouth-*.service
|
||||
#%exclude /lib/systemd/system/*.wants/plymouth-*.service
|
||||
#%exclude /lib/systemd/system/systemd-ask-password-plymouth.*
|
||||
# Packaged in gtk subpackage
|
||||
%exclude %{_mandir}/man1/systemadm.1*
|
||||
# Packaged in sysvinit subpackage
|
||||
@ -217,6 +246,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%dir /lib/systemd
|
||||
/lib/systemd/system
|
||||
/lib/systemd/system-generators
|
||||
%dir /usr/lib/systemd
|
||||
/usr/lib/systemd/user
|
||||
%dir %{_sysconfdir}/systemd
|
||||
%dir %{_sysconfdir}/bash_completion.d
|
||||
/etc/bash_completion.d/systemctl-bash-completion.sh
|
||||
@ -227,11 +258,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_bindir}/systemd-gnome-ask-password-agent
|
||||
%{_mandir}/man1/systemadm.1*
|
||||
|
||||
%files plymouth
|
||||
%defattr(-,root,root,-)
|
||||
/lib/systemd/system/plymouth-*.service
|
||||
/lib/systemd/system/*.wants/plymouth-*.service
|
||||
/lib/systemd/system/systemd-ask-password-plymouth.*
|
||||
#%files plymouth
|
||||
#%defattr(-,root,root,-)
|
||||
#/lib/systemd/system/plymouth-*.service
|
||||
#/lib/systemd/system/*.wants/plymouth-*.service
|
||||
#/lib/systemd/system/systemd-ask-password-plymouth.*
|
||||
|
||||
%files sysvinit
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user