diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-09-24 11:52:28 +0100 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-09-24 11:52:28 +0100 |
commit | a1ecbea210d7e62584c0d797571d8dcd4105472e (patch) | |
tree | cbebea600e43cdfbc03e8b91c46ff3d3f2d864b8 | |
parent | e5f17a197beb10d0bfca3f7a9573d392af37a3eb (diff) | |
parent | b695b7390c741803d01f870e08b907ae3cd3f162 (diff) | |
download | systemd-a1ecbea210d7e62584c0d797571d8dcd4105472e.tar.gz |
Merge remote-tracking branch 'origin/baserock/richardmaw/empty-machine-id' into baserock/morph
-rw-r--r-- | systemd.morph | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/systemd.morph b/systemd.morph index 11e6d3ce2d..74298e3dda 100644 --- a/systemd.morph +++ b/systemd.morph @@ -12,6 +12,7 @@ "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\"" + "sed -r -e '/Options=/s/,?strictatime//' \"$DESTDIR/lib/systemd/system/tmp.mount\" >\"$DESTDIR/etc/systemd/system/tmp.mount\"", + "touch \"$DESTDIR/etc/machine-id\"" ] } |