diff options
| author | Jonathan Bauer | 2013-07-08 14:37:43 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-07-08 14:37:43 +0200 |
| commit | c7ebb5c2299a3349ce1ac7da6065ea05ea083ff5 (patch) | |
| tree | bb9d062fc6737a05f333818118f6d23f5f958ada /remote | |
| parent | [kernel] remember last built version and if new kernel is detected, ask what ... (diff) | |
| parent | Added devel files for building pam-script, see Ticket #463 ... (diff) | |
| download | tm-scripts-c7ebb5c2299a3349ce1ac7da6065ea05ea083ff5.tar.gz tm-scripts-c7ebb5c2299a3349ce1ac7da6065ea05ea083ff5.tar.xz tm-scripts-c7ebb5c2299a3349ce1ac7da6065ea05ea083ff5.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/modules/german/german.conf | 3 | ||||
| -rw-r--r-- | remote/modules/kernel/kernel.build | 2 | ||||
| -rw-r--r-- | remote/modules/pam/pam.conf | 1 | ||||
| -rw-r--r-- | remote/modules/pam/pam.conf.zypper | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/remote/modules/german/german.conf b/remote/modules/german/german.conf index 5b27bed0..3bbaecca 100644 --- a/remote/modules/german/german.conf +++ b/remote/modules/german/german.conf @@ -1,5 +1,6 @@ REQUIRED_INSTALLED_PACKAGES=" - libX11-data" + libX11-data + language-pack-de" REQUIRED_CONTENT_PACKAGES=" libX11-data" REQUIRED_LIBRARIES="libX11-data" diff --git a/remote/modules/kernel/kernel.build b/remote/modules/kernel/kernel.build index a1a1fcd1..99ee36a2 100644 --- a/remote/modules/kernel/kernel.build +++ b/remote/modules/kernel/kernel.build @@ -51,7 +51,7 @@ build() { else make oldconfig || perror "make oldconfig failed" fi - pinfo "Kompaliere kernel... (this will take some time)" + pinfo "Compiling kernel... (this will take some time)" if gcc --version | grep "4\.7" && which distcc; then pinfo "USING DISTCC" make CC="distcc gcc-4.7" -j16 || perror "make failed" diff --git a/remote/modules/pam/pam.conf b/remote/modules/pam/pam.conf index fdfd215b..140bca9e 100644 --- a/remote/modules/pam/pam.conf +++ b/remote/modules/pam/pam.conf @@ -8,6 +8,7 @@ REQUIRED_INSTALLED_PACKAGES=" ldap-utils libnfsidmap2 nfs-common + libpam0g-dev " REQUIRED_CONTENT_PACKAGES=" libpam0g diff --git a/remote/modules/pam/pam.conf.zypper b/remote/modules/pam/pam.conf.zypper index f54c5a0f..9319e78c 100644 --- a/remote/modules/pam/pam.conf.zypper +++ b/remote/modules/pam/pam.conf.zypper @@ -10,6 +10,7 @@ REQUIRED_INSTALLED_PACKAGES=" nfsidmap nfs-client glibc + pam-devel " REQUIRED_CONTENT_PACKAGES=" pam_ldap |