diff options
| author | Simon Rettberg | 2013-04-24 20:11:51 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-04-24 20:11:51 +0200 |
| commit | 3ea8042163cdd191db1237ede4cbb06f497c9fdc (patch) | |
| tree | 71293396ef12f3fd2ddd4cf57335f710498c4fda /remote/modules | |
| parent | several suse fixes (login etc) (diff) | |
| parent | fix rsyslogd for ubuntu (hopefully not broken on suse :/) (diff) | |
| download | tm-scripts-3ea8042163cdd191db1237ede4cbb06f497c9fdc.tar.gz tm-scripts-3ea8042163cdd191db1237ede4cbb06f497c9fdc.tar.xz tm-scripts-3ea8042163cdd191db1237ede4cbb06f497c9fdc.zip | |
Super duper merge
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 | 7 | ||||
| -rw-r--r-- | remote/modules/systemd/data/etc/systemd/system/udhcpc@.service | 2 |
5 files changed, 8 insertions, 6 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 20b5df1b..f027d6e0 100644 --- a/remote/modules/rsyslogd/rsyslogd.conf +++ b/remote/modules/rsyslogd/rsyslogd.conf @@ -1,4 +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" diff --git a/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service b/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service index e7d4d170..a945e743 100644 --- a/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service +++ b/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service @@ -3,7 +3,7 @@ Description=DHCP Client [Service] Type=simple -ExecStart=/openslx/sbin/udhcpc -O domain -O nissrv -O nisdomain -t 8 -s /etc/udhcpc.openslx.script -i %I +ExecStart=/openslx/sbin/udhcpc -O domain -O nissrv -O nisdomain -O wpad -t 8 -s /etc/udhcpc.openslx.script -i %I [Install] WantedBy=multi-user.target |