diff options
| author | Jonathan Bauer | 2013-06-04 14:46:24 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-06-04 14:46:24 +0200 |
| commit | 7ee1c573bf73c5f23e66a4502e20df5109596af9 (patch) | |
| tree | 5422de5497126c31f4db3cddd8a708c08c566391 /remote | |
| parent | Merge branch 'master' of simonslx:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-7ee1c573bf73c5f23e66a4502e20df5109596af9.tar.gz tm-scripts-7ee1c573bf73c5f23e66a4502e20df5109596af9.tar.xz tm-scripts-7ee1c573bf73c5f23e66a4502e20df5109596af9.zip | |
Fix Simon's stupid bugs in vmplayer and policykit!
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/modules/policykit/policykit.build | 2 | ||||
| -rw-r--r-- | remote/modules/vmplayer/vmplayer.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/remote/modules/policykit/policykit.build b/remote/modules/policykit/policykit.build index 7c2f3991..591c180f 100644 --- a/remote/modules/policykit/policykit.build +++ b/remote/modules/policykit/policykit.build @@ -15,7 +15,7 @@ build () { post_copy() { local POLPATH="$(grep '/polkitd$' "$COPYLIST" | head -1 | sed -e 's/[\/&]/\\&/g')" - sed -i "s/%%POLKITD%%/${POLPATH}/g" "$TARGET_BUILD_DIR/etc/systemd/system/polkitd.service" + [ -n "$POLPATH" ] && sed -i "s/%%POLKITD%%/${POLPATH}/g" "$TARGET_BUILD_DIR/etc/systemd/system/polkitd.service" #Add Polkit User/Group/Shadow to Stage3.2 pinfo "Adding polkitd user to target system..." add_user "polkitd" diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build index 1c9887ef..a4dd8a29 100644 --- a/remote/modules/vmplayer/vmplayer.build +++ b/remote/modules/vmplayer/vmplayer.build @@ -1,7 +1,7 @@ fetch_source() { #mount vmware bundle directory [ ! -d /mnt/store ] && mkdir -p /mnt/store - if [ "x$(ls /mnt/store)" == "x" ]; then + if [ "x$(ls /mnt/store/vmware/*.bundle)" == "x" ]; then mount -t nfs -o ro,async,nolock 132.230.8.113:/srv/vmext /mnt/store || perror "Could not mount vmware bundle directory. Exiting." fi ARCH="$(uname -m)" |