diff options
| author | Manuel Schneider | 2013-10-24 12:38:39 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2013-10-24 12:38:39 +0200 |
| commit | 46521c0413dc1cfac21f91b8c8bac27c755b74ca (patch) | |
| tree | 1544159b592934ab73315b8df79076503e134c1a | |
| parent | [cups] Does not retry failed jobs anymore. (diff) | |
| parent | [printergui] Starts now tcpsvd and lpd directly (not via busybox). (diff) | |
| download | tm-scripts-46521c0413dc1cfac21f91b8c8bac27c755b74ca.tar.gz tm-scripts-46521c0413dc1cfac21f91b8c8bac27c755b74ca.tar.xz tm-scripts-46521c0413dc1cfac21f91b8c8bac27c755b74ca.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
| -rw-r--r-- | remote/modules/printergui/printergui.build | 1 | ||||
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 4 | ||||
| -rw-r--r-- | server/blacklists/essential/linux-extended | 8 |
3 files changed, 10 insertions, 3 deletions
diff --git a/remote/modules/printergui/printergui.build b/remote/modules/printergui/printergui.build index f6139ba6..3a0fd52b 100644 --- a/remote/modules/printergui/printergui.build +++ b/remote/modules/printergui/printergui.build @@ -15,5 +15,6 @@ build() { make || perror "'make' failed." } post_copy() { + mkdir -p "${TARGET_BUILD_DIR}/var/spool/STANDARD" chmod a+rwt "${TARGET_BUILD_DIR}/var/spool/STANDARD" } diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt index 4a0ba8c6..9319c6c5 100755 --- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt @@ -435,8 +435,8 @@ SPOOLDIR="/var/spool" QUEUE="STANDARD" # Start the lpdaemon listening on the given port -busybox tcpsvd -E 0.0.0.0 5515 \ - busybox lpd "$SPOOLDIR" \ +tcpsvd -E 0.0.0.0 5515 \ + lpd "$SPOOLDIR" \ sh -c "printergui $USER $SPOOLDIR/$QUEUE/\$DATAFILE" & # PID to kill the process diff --git a/server/blacklists/essential/linux-extended b/server/blacklists/essential/linux-extended index 54f500ed..8cf0c95a 100644 --- a/server/blacklists/essential/linux-extended +++ b/server/blacklists/essential/linux-extended @@ -11,4 +11,10 @@ - /usr/lib/systemd/** - /etc/systemd - /var/lib/NetworkManager - +# blacklist busybox from system, to force the use of our own +- /bin/busybox +- /sbin/busybox +- /usr/bin/busybox +- /usr/sbin/busybox +- /usr/local/bin/busybox +- /usr/local/sbin/busybox |