diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-05-16 14:39:20 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-05-16 14:39:20 +0000 |
| commit | 4fcc2e99ee7085c70806b3563d5555f4fbc1c8e3 (patch) | |
| tree | 3f0b96b0c8de416cb088ef789c625d02873c4285 | |
| parent | a1d5011d51f83f6c13916e34a24565435217b885 (diff) | |
| parent | 4b51449fff0b0ca7f2e0ed0f8619cd26eada441a (diff) | |
| download | infrastructure-4fcc2e99ee7085c70806b3563d5555f4fbc1c8e3.tar.gz | |
Merge remote-tracking branch 'definitions/master'
| -rw-r--r-- | strata/core.morph | 4 | ||||
| -rw-r--r-- | strata/core/util-linux.morph | 1 | ||||
| -rw-r--r-- | strata/foundation.morph | 2 | ||||
| -rw-r--r-- | strata/lvm/lvm2.morph | 5 |
4 files changed, 7 insertions, 5 deletions
diff --git a/strata/core.morph b/strata/core.morph index e10fd894..fe2103d2 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -321,8 +321,8 @@ chunks: - name: util-linux morph: strata/core/util-linux.morph repo: upstream:util-linux - ref: cd150a429d15a7c96918aa2432532ced0bd27465 - unpetrify-ref: v2.27 + ref: 44338f7fe6a529cef1f206dccd95e7282625c483 + unpetrify-ref: v2.28 build-depends: - autoconf - automake diff --git a/strata/core/util-linux.morph b/strata/core/util-linux.morph index 1ec7f8e2..a685af9c 100644 --- a/strata/core/util-linux.morph +++ b/strata/core/util-linux.morph @@ -7,5 +7,6 @@ configure-commands: # Installing to /bin so that they overwrite busybox login. - | ./configure --prefix="$PREFIX" \ + --enable-libmount-force-mountinfo \ --disable-use-tty-group \ --bindir=/bin diff --git a/strata/foundation.morph b/strata/foundation.morph index 64e021c1..3b0a09c1 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -106,7 +106,7 @@ chunks: - name: tbdiff morph: strata/foundation/tbdiff.morph repo: baserock:baserock/tbdiff - ref: 235e95c3479f96b04d33edecc684f985bda50e53 + ref: 06f3271314b72e0065cc638fcfa7695d56ddb2e2 unpetrify-ref: master - name: rsync morph: strata/foundation/rsync.morph diff --git a/strata/lvm/lvm2.morph b/strata/lvm/lvm2.morph index 49b5f0fc..d9633bb9 100644 --- a/strata/lvm/lvm2.morph +++ b/strata/lvm/lvm2.morph @@ -7,11 +7,12 @@ configure-commands: # if left to the default, @sbindir@ is expanded to the literal string # '${exec_prefix}/sbin' in the generated .service files. # -# udev rules *must* go in /lib, they'll be ignored if they go in /usr/lib. +# udev rules *must* go in wherever Systemd is configured to look at. We don't expect +# Systemd to change anymore. - | ./configure --prefix="$PREFIX" \ --sbindir="$PREFIX"/sbin \ - --with-udev-prefix=/ \ + --with-udev-prefix="$PREFIX" \ --with-systemdsystemunitdir="$PREFIX"/lib/systemd/system \ --enable-applib --enable-cmdlib --enable-pkgconfig --enable-lvmetad \ --enable-dmeventd --enable-udev_sync |