diff options
| author | Simon Rettberg | 2013-04-25 13:50:09 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-04-25 13:50:09 +0200 |
| commit | 9a63f9a9d10853ba5956a08497ccf5d7d97f04d6 (patch) | |
| tree | 903fdcba5c75a9438c1e4e5cab71c6df9807dc79 | |
| parent | fix rsyslogd for suse (diff) | |
| parent | start global install_package function (diff) | |
| download | tm-scripts-9a63f9a9d10853ba5956a08497ccf5d7d97f04d6.tar.gz tm-scripts-9a63f9a9d10853ba5956a08497ccf5d7d97f04d6.tar.xz tm-scripts-9a63f9a9d10853ba5956a08497ccf5d7d97f04d6.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
| -rw-r--r-- | data/kernel.wanted.config | 1 | ||||
| -rw-r--r-- | helper/fileutil.inc | 14 | ||||
| -rw-r--r-- | remote/modules/rsyslogd/rsyslogd.build | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/data/kernel.wanted.config b/data/kernel.wanted.config index 35aceb6a..79d001be 100644 --- a/data/kernel.wanted.config +++ b/data/kernel.wanted.config @@ -234,6 +234,7 @@ CONFIG_NET_VENDOR_XIRCOM=y CONFIG_NETXEN_NIC=y CONFIG_NIU=y CONFIG_NS83820=y +CONFIG_OVERLAYFS_FS=y CONFIG_PARPORT=y CONFIG_PCH_GBE=y CONFIG_PCMCIA_XIRCOM=y diff --git a/helper/fileutil.inc b/helper/fileutil.inc index f4cfe298..d37d546e 100644 --- a/helper/fileutil.inc +++ b/helper/fileutil.inc @@ -9,7 +9,19 @@ else perror "Could not determine this platform's packet manager" fi -# +# install given packet through system's packet manager +install_package() { + [ $# -eq 0 ] && perror "Sanity check failed: no argument given to install_package" + local PACKAGE_LIST="$@" + for PACKAGE in $PACKAGE_LIST; do + if [ "x$PACKET_MANAGER" == "xapt" ]; then + apt-get install -y $PACKAGE + elif [ "x$PACKET_MANAGER" == "xzypper" ]; then + zypper --no-refresh install -y $PACKAGE + fi + # TODO finish... + done +} # copy list of files using tar tarcopy () { diff --git a/remote/modules/rsyslogd/rsyslogd.build b/remote/modules/rsyslogd/rsyslogd.build index c46adb0d..14e6de8b 100644 --- a/remote/modules/rsyslogd/rsyslogd.build +++ b/remote/modules/rsyslogd/rsyslogd.build @@ -20,6 +20,7 @@ post_copy() { local RSL="$(find /usr/lib/ /lib/ -name rsyslog.service | head -1)" [ -z "$RSL" -o ! -e "$RSL" ] && perror "rsyslog.service not found on vorlage" + [ ! -d "$TARGET_BUILD_DIR/etc/systemd/system" ] && mkdir -p "$TARGET_BUILD_DIR/etc/systemd/system" cp -L "$RSL" "$TARGET_BUILD_DIR/etc/systemd/system/" sed -i 's/\/bin\/systemctl/-\/usr\/bin\/systemctl/g' "${TARGET_BUILD_DIR}"/etc/systemd/system/rsyslog.service sed -i 's/^Before=udev/#&/' "${TARGET_BUILD_DIR}"/etc/systemd/system/rsyslog.service |