diff options
| author | Jonathan Bauer | 2013-06-14 17:05:04 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-06-14 17:05:04 +0200 |
| commit | 90403a880c10650c44222a41245fe2d5b405b655 (patch) | |
| tree | b826465a00b5bf6857c44b51b1ab2030c99c9914 /remote | |
| parent | [systemd] enable pam support (fixes pam_systemd.so missing) (diff) | |
| parent | ldconfig: Include system's default paths (diff) | |
| download | tm-scripts-90403a880c10650c44222a41245fe2d5b405b655.tar.gz tm-scripts-90403a880c10650c44222a41245fe2d5b405b655.tar.xz tm-scripts-90403a880c10650c44222a41245fe2d5b405b655.zip | |
Merge branch 'master' of git:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/modules/kdm/data/etc/kde4/kdm/kdmrc | 4 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage31/rootfs-stage31.conf | 8 | ||||
| -rwxr-xr-x | remote/setup_target | 7 |
3 files changed, 12 insertions, 7 deletions
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc index 3126f70d..26da07d2 100644 --- a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc +++ b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc @@ -32,8 +32,8 @@ PreselectUser=None UseAdminSession=false [Shutdown] -HaltCmd=/usr/bin/systemctl poweroff -RebootCmd=/usr/bin/systemctl reboot +HaltCmd=/usr/bin/systemctl -ff poweroff +RebootCmd=/usr/bin/systemctl -ff reboot [xdmcp] Enable=false diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf index b493c370..47f77c0a 100644 --- a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf +++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf @@ -55,7 +55,7 @@ REQUIRED_FIRMWARE=" 3com/ RTL8192SE/ rtl_nic/ tigon/" -REQUIRED_FILES=" /etc/netconfig - /etc/networks - /etc/protocols - /etc/services" +REQUIRED_FILES=" + /etc/protocols + /etc/services +" diff --git a/remote/setup_target b/remote/setup_target index b0565550..54ed0cb0 100755 --- a/remote/setup_target +++ b/remote/setup_target @@ -314,7 +314,12 @@ post_process_target() { rm -r "${TARGET_BUILD_DIR}/lib/systemd" fi - ldconfig -r "${TARGET_BUILD_DIR}" + # figure out all relevant ld-paths + local LDTEMP="$TARGET_BUILD_DIR/ldconf-temp" + grep -h '^\s*/' /etc/ld.so.conf /etc/ld.so.conf.d/* > "$LDTEMP" + # TODO: Echo other stuff to $LDTEMP (but figure out if first or last match wins) + ldconfig -v -r "${TARGET_BUILD_DIR}" -f "/ldconf-temp" + unlink "$LDTEMP" } |