diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-04-05 13:55:41 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-04-05 13:55:41 +0100 |
| commit | 9a332ba261bea9e9f3c0915bc6f0c6a0d45a1d5d (patch) | |
| tree | 8f3431b002a1986223b6c8344848f532a141798a | |
| parent | 527cf3c0883bc881e884fee7b467220f8fc4788f (diff) | |
| parent | d7498df6813b97f60aa04efc16c561804f30a9dc (diff) | |
| download | systemd-9a332ba261bea9e9f3c0915bc6f0c6a0d45a1d5d.tar.gz | |
Merge branch 'liw/stop-netdev-rename' into baserock/morph
No review for merge, but I verified that this brings back eth0.
| -rw-r--r-- | systemd.morph | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/systemd.morph b/systemd.morph index dcdd44b1fc..b98a1796e5 100644 --- a/systemd.morph +++ b/systemd.morph @@ -11,6 +11,8 @@ "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\"" |