diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-03 16:47:08 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-03 16:47:08 -0300 |
| commit | a420f5c4c2a4eeb411175d086b339b620dba309d (patch) | |
| tree | aa810cc98c17cf30cad06226c22f8256c056430e /core/systemd/systemd.install | |
| parent | 0ec0464a32563349252dda85e9176a9475d6fc34 (diff) | |
| parent | 81de702a6fc79e430129a7d2b708d90f43ae5ba1 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vdrift/PKGBUILD
community-testing/widelands/PKGBUILD
core/cracklib/PKGBUILD
core/systemd/PKGBUILD
extra/imagemagick/PKGBUILD
extra/mesa/PKGBUILD
multilib/lib32-glibc/PKGBUILD
testing/libreoffice/PKGBUILD
testing/mpfr/PKGBUILD
testing/systemd/PKGBUILD
testing/sysvinit/PKGBUILD
testing/yp-tools/PKGBUILD
Diffstat (limited to 'core/systemd/systemd.install')
| -rw-r--r-- | core/systemd/systemd.install | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install index e369f094d..784926e17 100644 --- a/core/systemd/systemd.install +++ b/core/systemd/systemd.install @@ -8,22 +8,14 @@ post_install() { # enable getty@tty1 by default, but don't track the file systemctl enable getty@.service + systemd-machine-id-setup + echo ":: Append 'init=/bin/systemd' to your kernel command line in your" echo " bootloader to replace sysvinit with systemd" } post_upgrade() { - if sd_booted; then - # we moved the binary in 44-2 to /usr, so a reexec leads to a - # coredump. refuse this reexec and warn the user that they should - # reboot instead. - if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then - echo "warning: refusing to reexec systemd. the system should be rebooted." - else - systemctl daemon-reload - systemctl daemon-reexec - fi - fi + systemd-machine-id-setup # getty@tty1.service is no longer enabled by default, but we don't want to break # existing setups. |