diff options
| author | Simon Rettberg | 2014-06-16 19:09:46 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-06-16 19:09:46 +0200 |
| commit | 4acd9186d8a99f347ddc192b1ac8aceee4d6380e (patch) | |
| tree | 4f5d6ed6eb95999ea5b070079bac8e2603fb3fa5 /remote | |
| parent | [rfs-stage31] Restructured init script and includes a bit... could use more work (diff) | |
| parent | dont exit, else xfwm4 will not be created (diff) | |
| download | tm-scripts-4acd9186d8a99f347ddc192b1ac8aceee4d6380e.tar.gz tm-scripts-4acd9186d8a99f347ddc192b1ac8aceee4d6380e.tar.xz tm-scripts-4acd9186d8a99f347ddc192b1ac8aceee4d6380e.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/includes/kernel.inc | 11 | ||||
| -rwxr-xr-x | remote/onetime-fixes/install-xfce4-greybird-theme | 6 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage31/module.conf | 3 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/module.conf | 1 |
4 files changed, 13 insertions, 8 deletions
diff --git a/remote/includes/kernel.inc b/remote/includes/kernel.inc index 839edcc3..dc7f7f12 100644 --- a/remote/includes/kernel.inc +++ b/remote/includes/kernel.inc @@ -53,6 +53,8 @@ copy_kernel_modules() { check_kernel_base_dir + + local OLD_DIR="$(pwd)" # # process modules list @@ -121,18 +123,19 @@ copy_kernel_modules() { cp "${KERNEL_MODULES_DIR}/modules.builtin" "${TARGET_BUILD_DIR}/${KERNEL_MODULES_DIR}" # with modules.order and modules.builtin, we can run depmod for the rest of the files depmod -b "${TARGET_BUILD_DIR}" -a "${KERNEL_NEW_VERSION}" - - cd - >/dev/null + + # go back to wherever we were + cd "${OLD_DIR}" || perror "Could not cd back to ${OLD_DIR}." } copy_firmware() { pinfo "Copying firmware for kernel ${KERNEL_CURRENT_VERSION}..." [ -z "${REQUIRED_FIRMWARE}" ] && perror "REQUIRED_FIRMWARE is empty. Check your config file." - local OLD_DIR=$(pwd) check_kernel_base_dir + local OLD_DIR=$(pwd) # # process firmware list # @@ -199,7 +202,7 @@ copy_firmware() { fi fi - cd "$OLD_DIR" + cd "${OLD_DIR}" || perror "Could not cd back to ${OLD_DIR}." } copy_kernel() { diff --git a/remote/onetime-fixes/install-xfce4-greybird-theme b/remote/onetime-fixes/install-xfce4-greybird-theme index 6c1251a3..f5b111d7 100755 --- a/remote/onetime-fixes/install-xfce4-greybird-theme +++ b/remote/onetime-fixes/install-xfce4-greybird-theme @@ -15,7 +15,11 @@ if wget https://github.com/shimmerproject/Greybird/tarball/master -O /tmp/greybi cd /usr/share/themes tar xfz /tmp/greybird.tgz if [ -d "$GREYBIRD" ]; then - mv "$GREYBIRD" Greybird + if [ ! -d Greybird ]; then + mv "$GREYBIRD" Greybird + else + echo "/usr/share/themes/Greybird already exists! Is it good enough?" + fi else echo "Error mv'ing $GREYBIRD to Greybird" exit 1 diff --git a/remote/rootfs/rootfs-stage31/module.conf b/remote/rootfs/rootfs-stage31/module.conf index cfcb3055..7b221d93 100644 --- a/remote/rootfs/rootfs-stage31/module.conf +++ b/remote/rootfs/rootfs-stage31/module.conf @@ -53,9 +53,6 @@ REQUIRED_FIRMWARE=" rtl_nic/ tigon/ " -REQUIRED_BINARIES=" - grep -" REQUIRED_LIBRARIES=" libnss_dns libresolv diff --git a/remote/rootfs/rootfs-stage32/module.conf b/remote/rootfs/rootfs-stage32/module.conf index ed6c083d..bb08a09b 100644 --- a/remote/rootfs/rootfs-stage32/module.conf +++ b/remote/rootfs/rootfs-stage32/module.conf @@ -38,6 +38,7 @@ REQUIRED_BINARIES=" pkill getent ldconfig + grep " REQUIRED_LIBRARIES=" libcap |