diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | m4/libgcrypt.m4 | 122 | ||||
| -rw-r--r-- | src/remount-fs/remount-fs.c | 6 | ||||
| -rw-r--r-- | systemd.morph | 21 |
4 files changed, 149 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 4f26092e91..a3d55f59cb 100644 --- a/configure.ac +++ b/configure.ac @@ -927,12 +927,12 @@ AC_ARG_WITH([dbussessionservicedir], AC_ARG_WITH([dbussystemservicedir], AS_HELP_STRING([--with-dbussystemservicedir=DIR], [D-Bus system service directory]), [], - [with_dbussystemservicedir=$(readlink -m $($PKG_CONFIG --variable=session_bus_services_dir dbus-1)/../system-services)]) + [with_dbussystemservicedir=$(readlink -f $($PKG_CONFIG --variable=session_bus_services_dir dbus-1)/../system-services)]) AC_ARG_WITH([dbusinterfacedir], AS_HELP_STRING([--with-dbusinterfacedir=DIR], [D-Bus interface directory]), [], - [with_dbusinterfacedir=$(readlink -m $($PKG_CONFIG --variable=session_bus_services_dir dbus-1)/../interfaces)]) + [with_dbusinterfacedir=$(readlink -f $($PKG_CONFIG --variable=session_bus_services_dir dbus-1)/../interfaces)]) AC_ARG_WITH([bashcompletiondir], AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completions directory]), diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4 new file mode 100644 index 0000000000..6cf482fcba --- /dev/null +++ b/m4/libgcrypt.m4 @@ -0,0 +1,122 @@ +dnl Autoconf macros for libgcrypt +dnl Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc. +dnl +dnl This file is free software; as a special exception the author gives +dnl unlimited permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl +dnl This file is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + +dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, +dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. +dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed +dnl with the API version to also check the API compatibility. Example: +dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed +dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using +dnl this features allows to prevent build against newer versions of libgcrypt +dnl with a changed API. +dnl +AC_DEFUN([AM_PATH_LIBGCRYPT], +[ AC_REQUIRE([AC_CANONICAL_HOST]) + AC_ARG_WITH(libgcrypt-prefix, + AC_HELP_STRING([--with-libgcrypt-prefix=PFX], + [prefix where LIBGCRYPT is installed (optional)]), + libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") + if test x$libgcrypt_config_prefix != x ; then + if test x${LIBGCRYPT_CONFIG+set} != xset ; then + LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config + fi + fi + + AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) + tmp=ifelse([$1], ,1:1.2.0,$1) + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then + req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` + min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` + else + req_libgcrypt_api=0 + min_libgcrypt_version="$tmp" + fi + + AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) + ok=no + if test "$LIBGCRYPT_CONFIG" != "no" ; then + req_major=`echo $min_libgcrypt_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` + req_minor=`echo $min_libgcrypt_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` + req_micro=`echo $min_libgcrypt_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` + libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` + major=`echo $libgcrypt_config_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` + minor=`echo $libgcrypt_config_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` + micro=`echo $libgcrypt_config_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` + if test "$major" -gt "$req_major"; then + ok=yes + else + if test "$major" -eq "$req_major"; then + if test "$minor" -gt "$req_minor"; then + ok=yes + else + if test "$minor" -eq "$req_minor"; then + if test "$micro" -ge "$req_micro"; then + ok=yes + fi + fi + fi + fi + fi + fi + if test $ok = yes; then + AC_MSG_RESULT([yes ($libgcrypt_config_version)]) + else + AC_MSG_RESULT(no) + fi + if test $ok = yes; then + # If we have a recent libgcrypt, we should also check that the + # API is compatible + if test "$req_libgcrypt_api" -gt 0 ; then + tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` + if test "$tmp" -gt 0 ; then + AC_MSG_CHECKING([LIBGCRYPT API version]) + if test "$req_libgcrypt_api" -eq "$tmp" ; then + AC_MSG_RESULT([okay]) + else + ok=no + AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) + fi + fi + fi + fi + if test $ok = yes; then + LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` + LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` + ifelse([$2], , :, [$2]) + libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` + if test x"$libgcrypt_config_host" != xnone ; then + if test x"$libgcrypt_config_host" != x"$host" ; then + AC_MSG_WARN([[ +*** +*** The config script $LIBGCRYPT_CONFIG was +*** built for $libgcrypt_config_host and thus may not match the +*** used host $host. +*** You may want to use the configure option --with-libgcrypt-prefix +*** to specify a matching config script. +***]]) + fi + fi + else + LIBGCRYPT_CFLAGS="" + LIBGCRYPT_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(LIBGCRYPT_CFLAGS) + AC_SUBST(LIBGCRYPT_LIBS) +]) diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c index f432718d6b..75eaed2f9e 100644 --- a/src/remount-fs/remount-fs.c +++ b/src/remount-fs/remount-fs.c @@ -95,14 +95,16 @@ int main(int argc, char *argv[]) { } if (pid == 0) { - const char *arguments[5]; + const char *arguments[7]; /* Child */ arguments[0] = "/bin/mount"; arguments[1] = me->mnt_dir; arguments[2] = "-o"; arguments[3] = "remount"; - arguments[4] = NULL; + arguments[4] = "-o"; + arguments[5] = me->mnt_opts; + arguments[6] = NULL; execv("/bin/mount", (char **) arguments); diff --git a/systemd.morph b/systemd.morph new file mode 100644 index 0000000000..5151ec2ace --- /dev/null +++ b/systemd.morph @@ -0,0 +1,21 @@ +{ + "name": "systemd", + "kind": "chunk", + "build-system": "autotools", + "max-jobs": 1, + "configure-commands": [ + "sh autogen.sh", + "./configure --prefix=\"$PREFIX\" --enable-xz --disable-manpages --sysconfdir=/etc --localstatedir=/var --libdir=\"$PREFIX/lib\" --libexecdir=\"$PREFIX/libexec\" --with-rootprefix= --with-rootlibdir=/lib --with-firmware-path=/lib/firmware/updates:/lib/firmware" + ], + "install-commands": [ + "make DESTDIR=\"$DESTDIR\" install", + "mkdir -p \"$DESTDIR\"/sbin", + "ln -s /lib/systemd/systemd \"$DESTDIR\"/sbin/init", + "for f in telinit runlevel shutdown poweroff reboot halt; do ln -s /bin/systemctl \"$DESTDIR/sbin/$f\"; done", + "rm -f \"$DESTDIR/etc/udev/rules.d/80-net-name-slot.rules\"", + "touch \"$DESTDIR/etc/udev/rules.d/80-net-name-slot.rules\"", + "sed -e 's|@sushell@|/bin/sh|g' units/debug-shell.service.in >\"$DESTDIR/etc/systemd/system/debug-shell.service\"", + "sed -r -e '/Options=/s/,?strictatime//' \"$DESTDIR/lib/systemd/system/tmp.mount\" >\"$DESTDIR/etc/systemd/system/tmp.mount\"", + "touch \"$DESTDIR/etc/machine-id\"" + ] +} |