Revert "WIP: Make systemd sessions start on user login"

This reverts commit aa9a482cc011a84628da11c61209ff23b12a1c61.

7 files changed, 38 insertions, 53 deletions

diff --git a/strata/core.morph b/strata/core.morph
index 37095a28..cae24f3f 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -228,6 +228,18 @@ chunks:
   - autoconf-tarball
   - automake
   - libtool-tarball
+- name: util-linux
+  morph: strata/core/util-linux.morph
+  repo: upstream:util-linux
+  ref: b567c9cbc854a36da0a198e4dcc463e134d26a25
+  unpetrify-ref: v2.25.2
+  build-depends:
+  - autoconf-tarball
+  - automake
+  - gettext-tarball
+  - git
+  - libtool-tarball
+  - pkg-config
 - name: nano
   morph: strata/core/nano.morph
   repo: upstream:nano-tarball
@@ -244,39 +256,6 @@ chunks:
   build-depends:
   - flex
   - texinfo-tarball
-- name: attr
-  morph: strata/core/attr.morph
-  repo: upstream:attr
-  ref: 4b005410f865895d4dcd56e2c135278a7a315877
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - autoconf-tarball
-  - automake
-  - gettext-tarball
-  - libtool-tarball
-- name: acl
-  morph: strata/core/acl.morph
-  repo: upstream:acl
-  ref: f13e09bd54fd4a501c4952f002ed2752bdd9f93b
-  unpetrify-ref: v2.2.52
-  build-depends:
-  - autoconf-tarball
-  - automake
-  - gettext-tarball
-  - libtool-tarball
-  - attr
-- name: linux-pam
-  morph: strata/core/linux-pam.morph
-  repo: upstream:linux-pam
-  ref: b1521c97e73b10469f7b34c0571d51c647eca83c
-  unpetrify-ref: Linux-PAM-1.1.8
-  build-depends:
-  - autoconf-tarball
-  - automake
-  - gettext-tarball
-  - libtool-tarball
-  - pkg-config
-  - flex
 - name: shadow
   morph: strata/core/shadow.morph
   repo: upstream:shadow
@@ -288,22 +267,6 @@ chunks:
   - gettext-tarball
   - libtool-tarball
   - bison
-  - acl
-  - linux-pam
-- name: util-linux
-  morph: strata/core/util-linux.morph
-  repo: upstream:util-linux
-  ref: b567c9cbc854a36da0a198e4dcc463e134d26a25
-  unpetrify-ref: v2.25.2
-  build-depends:
-  - autoconf-tarball
-  - automake
-  - gettext-tarball
-  - git
-  - libtool-tarball
-  - pkg-config
-  - linux-pam
-  - shadow
 - name: patch
   morph: strata/core/patch.morph
   repo: upstream:patch
diff --git a/strata/core/shadow.morph b/strata/core/shadow.morph
index 5d5a72ee..6887a6b3 100644
--- a/strata/core/shadow.morph
+++ b/strata/core/shadow.morph
@@ -2,4 +2,4 @@ name: shadow
 kind: chunk
 build-system: autotools
 configure-commands:
-- ./autogen.sh --with-selinux=no --sysconfdir=/etc --with-pam=yes
+- ./autogen.sh --with-selinux=no --sysconfdir=/etc
diff --git a/strata/coreutils-common/tar.morph b/strata/coreutils-common/tar.morph
index 17d6a597..d9ee3a36 100644
--- a/strata/coreutils-common/tar.morph
+++ b/strata/coreutils-common/tar.morph
@@ -2,8 +2,7 @@ name: tar
 kind: chunk
 build-system: autotools
 pre-configure-commands:
-- rm .gitmodules
-- bash bootstrap --skip-po --gnulib-srcdir="$(pwd)/gnulib" --paxutils-srcdir="$(pwd)/paxutils"
+- bash bootstrap --skip-po
 configure-commands:
 # Configure flag notes:
 # 1. Needed to run configure as root
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 815aae0f..8b7b4e4d 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -4,6 +4,11 @@ description: Basic userland runtime system
 build-depends:
 - morph: strata/coreutils-common.morph
 chunks:
+- name: attr
+  morph: strata/foundation/attr.morph
+  repo: upstream:attr
+  ref: 4b005410f865895d4dcd56e2c135278a7a315877
+  unpetrify-ref: baserock/morph
 - name: groff
   morph: strata/foundation/groff.morph
   repo: upstream:groff-git
@@ -24,6 +29,8 @@ chunks:
   repo: upstream:libcap2
   ref: 4f7cca1bc9c2a274edb39d351b65747010d3ba7b
   unpetrify-ref: baserock/morph
+  build-depends:
+  - attr
 - name: libffi
   morph: strata/foundation/libffi.morph
   repo: upstream:libffi
@@ -60,6 +67,11 @@ chunks:
   ref: 412eed473b557ed2172d81d76fa1e1f53c973a67
   build-depends:
   - libgpg-error
+- name: linux-pam
+  morph: strata/foundation/linux-pam.morph
+  repo: upstream:linux-pam
+  ref: b1521c97e73b10469f7b34c0571d51c647eca83c
+  unpetrify-ref: Linux-PAM-1.1.8
 - name: systemd
   morph: strata/foundation/systemd.morph
   repo: upstream:systemd
@@ -71,6 +83,7 @@ chunks:
   - kmod
   - libcap2
   - libgcrypt
+  - linux-pam
 - name: libusb
   repo: upstream:libusb
   ref: e11525c66c7dd2db466c8f5785ff0b37d6a99ec9
@@ -93,6 +106,13 @@ chunks:
   repo: upstream:fuse
   ref: d69e627e79862e2df4ff9ff1ddb0363c4520d8a8
   unpetrify-ref: baserock/morph
+- name: acl
+  morph: strata/foundation/acl.morph
+  repo: upstream:acl
+  ref: f13e09bd54fd4a501c4952f002ed2752bdd9f93b
+  unpetrify-ref: v2.2.52
+  build-depends:
+  - attr
 - name: e2fsprogs
   morph: strata/foundation/e2fsprogs.morph
   repo: upstream:e2fsprogs
@@ -104,6 +124,8 @@ chunks:
   ref: 563ff3b07d85517e3589a1f2e6f45a8265e3f071
   unpetrify-ref: v3.18.2
   build-depends:
+  - attr
+  - acl
   - lzo
   - e2fsprogs
 - name: dbus
@@ -126,6 +148,8 @@ chunks:
   repo: baserock:baserock/tbdiff
   ref: 47fb728f2432929868666afc915dbc5a64836c08
   unpetrify-ref: master
+  build-depends:
+  - attr
 - name: dbus-glib
   repo: upstream:dbus-glib
   ref: 397e8297d433547c9bf4150ddd2b9e0b4c39628c
diff --git a/strata/core/acl.morph b/strata/foundation/acl.morph
index 144dff0e..4489f5d5 100644
--- a/strata/core/acl.morph
+++ b/strata/foundation/acl.morph
@@ -1,5 +1,4 @@
 name: acl
 kind: chunk
 install-commands:
-- make DESTDIR="$DESTDIR" install-lib
 - make DESTDIR="$DESTDIR" install-dev
diff --git a/strata/core/attr.morph b/strata/foundation/attr.morph
index 46d0b9c0..46d0b9c0 100644
--- a/strata/core/attr.morph
+++ b/strata/foundation/attr.morph
diff --git a/strata/core/linux-pam.morph b/strata/foundation/linux-pam.morph
index 0dfbe759..0dfbe759 100644
--- a/strata/core/linux-pam.morph
+++ b/strata/foundation/linux-pam.morph