Skip to content

Commit

Permalink
Fix installation paths (use systemd unitdir and remove split /usr)
Browse files Browse the repository at this point in the history
  • Loading branch information
vaeth committed Jul 14, 2017
1 parent eb08361 commit 99050c2
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
19 changes: 10 additions & 9 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ The usage is extremely simple: If you have an openrc init script
possibly with a configuration file
/etc/conf.d/SERVICE
you just start/stop this service by calling
/usr/bin/openrc-wrapper SERVICE start
/bin/openrc-wrapper SERVICE start
or
/usr/bin/openrc-wrapper SERVICE stop
/bin/openrc-wrapper SERVICE stop
respectively. Note that this does not really start/stop the service in the
sense of openrc but just executes the corresponding function of the
initscript (in an environment which somewhat emulates the openrc environment).
Expand All @@ -37,18 +37,19 @@ and
openrc-wrapper alsasound restore

A typical systemd service using an openrc initscript will contain
ExecStart=/usr/bin/openrc-wrapper SERVICE start
ExecStart=/bin/openrc-wrapper SERVICE start
and possibly also
ExecStop=/usr/bin/openrc-wrapper SERVICE stop
ExecStop=/bin/openrc-wrapper SERVICE stop
Some examples are in the provided systemd/system folder.

For installation just copy bin/* into /usr/bin and,
For installation just copy bin/* into /bin and,
at your discretion, the provided systemd initscripts systemd/system/*
into your systemd system folder. In order to get completion for zsh, also copy
into your systemd unit folder. In order to get completion for zsh, also copy
zsh/_openrc-wrapper somewher into you your zsh's $fpath.
Thus, a typical manual installation looks like this
(after you did 'cd' into the project's directory):
cp bin/* /usr/bin
cp systemd/system/* /usr/lib/systemd/system
cp bin/* /bin
cp systemd/system/* \
"`pkg-config --variable=systemdsystemunitdir systemd`"
cp zsh/* /usr/share/zsh/site-functions
(For gentoo there is an ebuild which does this in the mv overlay).
(For gentoo there is an ebuild in the mv overlay which does this).
2 changes: 1 addition & 1 deletion systemd/system/modules.service
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Before=firewall.service firewall-close.service network.target
[Service]
Type=oneshot
RemainAfterExit=true
ExecStart=/usr/bin/openrc-wrapper modules start
ExecStart=/bin/openrc-wrapper modules start

[Install]
WantedBy=sysinit.target
2 changes: 1 addition & 1 deletion systemd/system/openrdate.service
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Requires=network-online.target
[Service]
Type=oneshot
RemainAfterExit=true
ExecStart=/usr/bin/openrc-wrapper openrdate start
ExecStart=/bin/openrc-wrapper openrdate start

[Install]
WantedBy=multi-user.target

0 comments on commit 99050c2

Please sign in to comment.