summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-09-15Merge branch 'notsystemd/postmove' into notsystemd/masterLuke Shumaker
# Conflicts: # build-aux/Makefile.each.tail/50-sd.mk # build-aux/Makefile.each.tail/70-man.mk # src/grp-resolve/libbasic-dns/Makefile # src/grp-system/libcore/Makefile # tools/notsd-move
2016-09-15Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2016-09-15./tools/notsd-moveLuke Shumaker
2016-09-15fixLuke Shumaker
2016-09-15Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2016-09-15./tools/notsd-moveLuke Shumaker
2016-09-15stuffLuke Shumaker
2016-09-15stuffLuke Shumaker
2016-09-14Merge branch 'notsystemd/postmove' into notsystemd/masterLuke Shumaker
# Conflicts: # src/grp-journal/systemd-journald/Makefile # src/grp-login/systemd-logind/Makefile # src/grp-machine/grp-import/systemd-export/Makefile # src/grp-machine/grp-import/systemd-import/Makefile # src/grp-machine/grp-import/systemd-pull/Makefile # src/grp-machine/systemd-machined/Makefile # src/grp-network/libnetworkd-core/Makefile # src/grp-resolve/libbasic-dns/Makefile # src/grp-resolve/systemd-resolved/Makefile # src/grp-utils/systemd-path/Makefile # src/libshared/src/Makefile # src/libsystemd-network/include/systemd-network/sd-ndisc.h # src/libsystemd/Makefile # src/libsystemd/src/test.mk # src/libudev/Makefile # src/systemd-dbus1-generator/Makefile # src/systemd-nspawn/nspawn.c Signed-off-by: Luke Shumaker <lukeshu@sbcglobal.net>
2016-09-13Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2016-09-13./tools/notsd-moveLuke Shumaker
2016-09-13Merge branch 'systemd/parabola' into notsystemd/premoveLuke Shumaker
# Conflicts: # Makefile.am # tmpfiles.d/etc.conf.m4
2016-09-13Merge tag 'systemd/v231-1.parabola1' into systemd/parabolaLuke Shumaker
2016-09-13# Rename "Linux Boot Manager" -> "Systemd Boot Manager"systemd/v231-1.parabola1Luke Shumaker
sed -i 's|Linux Boot Manager|Systemd Boot Manager|' src/boot/bootctl.c
2016-09-13FSDG: man/: Use FSDG operating systems as examples.Luke Shumaker
2016-09-13FSDG: systemd-resolved: Default to hostname "gnu-linux" instead of "linux"Luke Shumaker
2016-09-13FSDG: os-release: Default ID to "gnu-linux" instead of "linux".Luke Shumaker
As far as I can tell, no code in this repository actually uses the ID field, so this is just a man page change.
2016-09-13FSDG: os-release: Default to NAME "GNU/Linux" instead of "Linux".Luke Shumaker
2016-09-13FSDG: os-release: Default to PRETTY_NAME "GNU/Linux" instead of "Linux".Luke Shumaker
2016-09-13FSDG: man/: Refer to the operating system as GNU/Linux.Luke Shumaker
This is not a blind replacement of "Linux" with "GNU/Linux". In some cases, "Linux" is (correctly) used to refer to just the kernel. In others, it is in a string for which code must also be adjusted; these instances are not included in this commit.
2016-09-13Merge branch 'notsystemd/postmove' into notsystemd/masterLuke Shumaker
2016-09-13Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2016-09-13./tools/notsd-moveLuke Shumaker
2016-09-13moreLuke Shumaker
2016-09-13Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2016-09-13./tools/notsd-moveLuke Shumaker
2016-09-13moreLuke Shumaker
2016-09-13tidyLuke Shumaker
2016-09-13Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2016-09-13./tools/notsd-moveLuke Shumaker
2016-09-13moreLuke Shumaker
2016-09-13Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2016-09-13./tools/notsd-moveLuke Shumaker
2016-09-13Makefile.am: add missing grp MakefilesLuke Shumaker
2016-09-13Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2016-09-13./tools/notsd-moveLuke Shumaker
2016-09-13I'm having issues with these directories when switching branches.Luke Shumaker
So create them to always be there.
2016-09-13whoops, don't create a file named 'all'Luke Shumaker
2016-09-13Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2016-09-13./tools/notsd-moveLuke Shumaker
2016-09-13tools/notsd-move: don't require putting something in each fileLuke Shumaker
2016-09-13Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2016-09-13./tools/notsd-moveLuke Shumaker
2016-09-13work on Makefile.amLuke Shumaker
2016-09-13mv build-aux/Makefile.each.tail/70-{sd,man}.mkLuke Shumaker
2016-09-13Merge branch 'notsystemd/postmove' into tmp/postmoveLuke Shumaker
2016-09-13./tools/notsd-moveLuke Shumaker
2016-09-13tools/: pull changes from masterLuke Shumaker
2016-09-13tools/notsd-move: add symlinks to make includes more similarLuke Shumaker
2016-09-13remove unnecessary gcrypt-util dupsLuke Shumaker