diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-25 11:06:43 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-25 11:06:43 -0300 |
commit | aa2f414743bd0ca41ee63e7a26ac543a4f91b22f (patch) | |
tree | 49c109395d8aa3267d7fcdaf275d166b1b97b8b1 /core/systemd/systemd.install | |
parent | a0426fca029e4fabdbd378793c5c12a4a808abb7 (diff) | |
parent | 63a70fcf745c565e06a5fdda4942bc6c19d9f56f (diff) |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre-mips64el
Conflicts:
community/oss/PKGBUILD
community/pdnsd/PKGBUILD
community/subtle/PKGBUILD
Diffstat (limited to 'core/systemd/systemd.install')
-rw-r--r-- | core/systemd/systemd.install | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install index 0b10f9537..cb82b6c8c 100644 --- a/core/systemd/systemd.install +++ b/core/systemd/systemd.install @@ -5,9 +5,7 @@ sd_booted() { } post_install() { - if [ ! -f etc/machine-id ]; then - systemd-machine-id-setup - fi + systemd-machine-id-setup # enable getty@tty1 by default, but don't track the file systemctl enable getty@.service @@ -17,9 +15,7 @@ post_install() { } post_upgrade() { - if [ ! -f etc/machine-id ]; then - systemd-machine-id-setup - fi + systemd-machine-id-setup if sd_booted; then # we moved the binary in 44-2 to /usr, so a reexec leads to a @@ -42,10 +38,4 @@ post_upgrade() { fi } -post_remove() { - if getent group lock >/dev/null; then - groupdel lock - fi -} - # vim:set ts=2 sw=2 et: |