diff options
| author | Christian Rößler | 2013-06-06 19:03:00 +0200 |
|---|---|---|
| committer | Christian Rößler | 2013-06-06 19:03:00 +0200 |
| commit | 9fc696b82d20a2db8d0b524eda5c6dd65467871c (patch) | |
| tree | b23e23e854187e5bd4158603fae6599c228a0186 /remote/rootfs | |
| parent | [helper] Add key-value util (diff) | |
| download | tm-scripts-9fc696b82d20a2db8d0b524eda5c6dd65467871c.tar.gz tm-scripts-9fc696b82d20a2db8d0b524eda5c6dd65467871c.tar.xz tm-scripts-9fc696b82d20a2db8d0b524eda5c6dd65467871c.zip | |
Included new module german for german keyboards (qwertz)
Also changed rootfs-stage32: env vars now through new add_env
stage32-opensuse has new target german
Diffstat (limited to 'remote/rootfs')
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.build | 3 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.conf | 3 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build index 162dcdc2..a796f738 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build @@ -70,8 +70,7 @@ post_copy() { "${TARGET_BUILD_DIR}"/dev || perror "Copying devices from running system failed." # set /etc/environment to include /opt/openslx/bin and /opt/openslx/sbin - echo "PATH=\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin\"" \ - > "${TARGET_BUILD_DIR}/etc/environment" + add_env PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin" # copy static files cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}" || perror "Copying static files from data/* failed." diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf index 27421166..a2dd3987 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf @@ -50,8 +50,7 @@ REQUIRED_LIBRARIES=" libcap libresolv libau" REQUIRED_DIRECTORIES="/lib/xtables" -REQUIRED_FILES=" /etc/environment - /etc/issue +REQUIRED_FILES=" /etc/issue /etc/inputrc /etc/localtime /etc/login.defs diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper index af6f2546..89ffb6a1 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper @@ -1,7 +1,7 @@ REQUIRED_MODULES=" kernel" REQUIRED_INSTALLED_PACKAGES="nfs-client xfsprogs squashfs timezone" REQUIRED_CONTENT_PACKAGES="timezone" -REQUIRED_DIRECTORIES="/usr/lib/xtables" +REQUIRED_DIRECTORIES="/usr/$LIB64/xtables" REQUIRED_LIBRARIES=" libcap libcidn libcom_err @@ -20,8 +20,7 @@ REQUIRED_LIBRARIES=" libcap libtinfo libresolv libau" -REQUIRED_FILES=" /etc/environment - /etc/issue +REQUIRED_FILES=" /etc/issue /etc/inputrc /etc/localtime /etc/login.defs |