diff options
| -rw-r--r-- | src/remount-fs/remount-fs.c | 6 | ||||
| -rw-r--r-- | systemd.morph | 18 |
2 files changed, 22 insertions, 2 deletions
diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c index b49d095cbb..b436203b16 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..dcdd44b1fc --- /dev/null +++ b/systemd.morph @@ -0,0 +1,18 @@ +{ + "name": "systemd", + "kind": "chunk", + "build-system": "autotools", + "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" + ], + "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", + "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\"" + ] +} |