diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-18 17:29:13 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-18 18:13:14 +0000 |
| commit | d8635a9a4eecaa6e58edc8a31add0a8415ead393 (patch) | |
| tree | d722a2c1aa58330b9758731016475ff6e124654b | |
| parent | 86cb3fb50a8d04911f5191eb80edb2295350e120 (diff) | |
| download | morph-d8635a9a4eecaa6e58edc8a31add0a8415ead393.tar.gz | |
Remove fstab hack from nfsboot.configure
There is no longer a default /etc/fstab in the Baserock fhs-dirs chunk,
and the nfsboot.write extension does not use the default Btrfs system
layout so no entry is added for / to /etc/fstab at deploy-time.
We cannot have / in /etc/fstab for nfsboot deployments because it
causes systemd to remount / during bootup, which breaks everything.
| -rwxr-xr-x | morphlib/exts/nfsboot.configure | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/morphlib/exts/nfsboot.configure b/morphlib/exts/nfsboot.configure index 8dc6c67c..d6b254d4 100755 --- a/morphlib/exts/nfsboot.configure +++ b/morphlib/exts/nfsboot.configure @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2013-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,7 +26,4 @@ auto lo iface lo inet loopback EOF - # Stop fstab from mounting '/' - mv "$1/etc/fstab" "$1/etc/fstab.old" - awk '/^ *#/ || $2 != "/"' "$1/etc/fstab.old" > "$1/etc/fstab" fi |