Remove some hacks not needed anymore after the /usr merge

2 files changed, 12 insertions, 40 deletions

diff --git a/strata/foundation/kmod.morph b/strata/foundation/kmod.morph
index 8f158e8e..ee1b1254 100644
--- a/strata/foundation/kmod.morph
+++ b/strata/foundation/kmod.morph
@@ -14,36 +14,10 @@ build-commands:
 - make
 install-commands:
 - make DESTDIR="$DESTDIR" pkgconfigdir="$PREFIX"/lib/pkgconfig install
-
-# WARNING with the following command:
-# if the staging area when kmod is built is sufficiently different to the
-# staging area that kmod is included in, then these symlinks may not work.
-#
-# i.e. if /sbin isn't a symlink when this is built (fhs-dirs isn't included or
-# doesn't symlink /sbin to /usr/bin) then we get symlinks in /sbin which point
-# to ../usr/bin, but if /sbin is itself a symlink to /usr/bin, then the symlinks
-# would end up in /usr/bin, which would point to ../usr/bin, which would evaluate
-# to /usr/usr/bin.
-#
-# The alternatives to this are:
-#
-# 1. Use hardlinks instead, which has the problem of ssh-rsync upgrades duplicating
-#    the binary
-#
-# 2. Use an absolute path for the symlink, which makes things interesting when
-#    inspecting a chroot
-#
-# 3. Use a wrapper script to invoke kmod with a different name, which isn't
-#    possible in busybox ash without making a temporary directory, which means
-#    you need an extra process to hang around to clean that directory up.
-- |
-  if [ -h /sbin ]; then
-    for app in modprobe lsmod rmmod insmod modinfo depmod; do
-      ln -sf kmod "$DESTDIR$PREFIX/bin/$app"
-    done
-  else
-    install -d "$DESTDIR"/sbin
-    for app in modprobe lsmod rmmod insmod modinfo depmod; do
-      ln -sf ../"$PREFIX"/bin/kmod "$DESTDIR/sbin/$app"
-    done
-  fi
+post-install-commands:
+- ln -s kmod "$DESTDIR/$PREFIX"/bin/modprobe
+- ln -s kmod "$DESTDIR/$PREFIX"/bin/lsmod
+- ln -s kmod "$DESTDIR/$PREFIX"/bin/rmmod
+- ln -s kmod "$DESTDIR/$PREFIX"/bin/insmod
+- ln -s kmod "$DESTDIR/$PREFIX"/bin/modinfo
+- ln -s kmod "$DESTDIR/$PREFIX"/bin/depmod
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
index ae1f6a14..d0f962a8 100644
--- a/strata/foundation/systemd.morph
+++ b/strata/foundation/systemd.morph
@@ -3,13 +3,11 @@ kind: chunk
 build-system: autotools
 configure-commands:
 - ./autogen.sh
-# KILL added because it picks up /usr/bin/kill, which is not installed on
-# all systems
-- KILL=/bin/kill ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var
-                             --disable-manpages
-                             --disable-tests
-                             --libexecdir="$PREFIX/libexec"
-                             --enable-split-usr
+- ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var
+              --disable-manpages
+              --disable-tests
+              --libexecdir="$PREFIX/libexec"
+              --enable-split-usr
 post-install-commands:
 - mkdir -p "$DESTDIR"/sbin
 - ln -s "$PREFIX"/lib/systemd/systemd "$DESTDIR"/sbin/init