diff options
| author | Michael Neves | 2013-05-09 18:22:06 +0200 |
|---|---|---|
| committer | Michael Neves | 2013-05-09 18:22:06 +0200 |
| commit | ee1dfe851c1538171e13296d39781b1963504281 (patch) | |
| tree | b94f8d2b7ddff7a71cc4e4fc98ee1fd82d9e3d2a | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| parent | Merge branch 'master' of git:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-ee1dfe851c1538171e13296d39781b1963504281.tar.gz tm-scripts-ee1dfe851c1538171e13296d39781b1963504281.tar.xz tm-scripts-ee1dfe851c1538171e13296d39781b1963504281.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper | 1 | ||||
| -rwxr-xr-x | remote/setup_target | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper index 3fdfe499..8543a284 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper @@ -51,7 +51,6 @@ REQUIRED_FILES=" /etc/environment /etc/inputrc /etc/localtime /etc/login.defs - /etc/nsswitch.conf /etc/securetty /etc/protocols /etc/services diff --git a/remote/setup_target b/remote/setup_target index f5e5f9e7..10d6b575 100755 --- a/remote/setup_target +++ b/remote/setup_target @@ -275,7 +275,7 @@ clean_modules() { && rm -rf "${TARGET_BUILD_DIR}"/* \ || perror "Error deleting $TARGET_BUILD_DIR" fi - set -- $(ls ${TARGET_DIR}) + set -- $(ls ${TARGET_DIR} | grep -v kernel) fi cd ${TARGET_DIR} while (( "$#" )); do |