diff options
| author | Jonathan Bauer | 2013-04-24 18:54:58 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-04-24 18:54:58 +0200 |
| commit | 8de671e4a03a47a7ca7c7431ee7d250f76fb75ab (patch) | |
| tree | 354df0d7e277b1d4b44842e3a99464ae7ac5591b /remote/modules | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-8de671e4a03a47a7ca7c7431ee7d250f76fb75ab.tar.gz tm-scripts-8de671e4a03a47a7ca7c7431ee7d250f76fb75ab.tar.xz tm-scripts-8de671e4a03a47a7ca7c7431ee7d250f76fb75ab.zip | |
fix rsyslogd for ubuntu (hopefully not broken on suse :/)
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/kdm/kdm.build | 1 | ||||
| -rw-r--r-- | remote/modules/pam/pam.build | 2 | ||||
| -rw-r--r-- | remote/modules/rsyslogd/rsyslogd.build | 2 | ||||
| -rw-r--r-- | remote/modules/rsyslogd/rsyslogd.conf | 6 |
4 files changed, 6 insertions, 5 deletions
diff --git a/remote/modules/kdm/kdm.build b/remote/modules/kdm/kdm.build index a2602301..b5d1be08 100644 --- a/remote/modules/kdm/kdm.build +++ b/remote/modules/kdm/kdm.build @@ -22,7 +22,6 @@ post_copy() { #copy required icons - [ ! -z "$REQUIRED_SYSTEM_FILES" ] && tarcopy "$REQUIRED_SYSTEM_FILES" "$TARGET_BUILD_DIR" gtk-update-icon-cache-3.0 "${TARGET_BUILD_DIR}/usr/share/icons/oxygen/" || pwarning "update-icon-cache-3.0 failed." } diff --git a/remote/modules/pam/pam.build b/remote/modules/pam/pam.build index 9e287c89..4392e64d 100644 --- a/remote/modules/pam/pam.build +++ b/remote/modules/pam/pam.build @@ -7,5 +7,5 @@ build() { } post_copy() { - [ ! -z "$REQUIRED_SYSTEM_FILES" ] && tarcopy "$REQUIRED_SYSTEM_FILES" "$TARGET_BUILD_DIR" + : } diff --git a/remote/modules/rsyslogd/rsyslogd.build b/remote/modules/rsyslogd/rsyslogd.build index cee5c7ed..c46adb0d 100644 --- a/remote/modules/rsyslogd/rsyslogd.build +++ b/remote/modules/rsyslogd/rsyslogd.build @@ -13,6 +13,8 @@ build() { } post_copy() { + + # pwd = module's build dir mkdir -p "${TARGET_BUILD_DIR}"/var/spool/rsyslog diff --git a/remote/modules/rsyslogd/rsyslogd.conf b/remote/modules/rsyslogd/rsyslogd.conf index a33e677f..f027d6e0 100644 --- a/remote/modules/rsyslogd/rsyslogd.conf +++ b/remote/modules/rsyslogd/rsyslogd.conf @@ -1,5 +1,5 @@ REQUIRED_PACKAGES=" rsyslog" REQUIRED_BINARIES=" rsyslogd" -REQUIRED_FILES=" /etc/rsyslog.conf" -REQUIRED_DIRECTORIES=" /etc/rsyslog.d - /usr/lib/rsyslog" +REQUIRED_DIRECTORIES=" /usr/lib/rsyslog" +REQUIRED_SYSTEM_FILES=" /etc/rsyslog.conf + /etc/rsyslog.d/50-default.conf" |