diff options
| author | Oliver Tappe | 2008-02-16 18:11:53 +0100 |
|---|---|---|
| committer | Oliver Tappe | 2008-02-16 18:11:53 +0100 |
| commit | 7b1c552ede13b5129db848f610fe3c27b33cd6d3 (patch) | |
| tree | d4dbe31ab5daf8ab8b9c3c666c14495f43870f18 /initramfs | |
| parent | Remove udev rules for eth* device (and other) modification (not correct for (diff) | |
| download | core-7b1c552ede13b5129db848f610fe3c27b33cd6d3.tar.gz core-7b1c552ede13b5129db848f610fe3c27b33cd6d3.tar.xz core-7b1c552ede13b5129db848f610fe3c27b33cd6d3.zip | |
* when invoking init-hook scripts and plugin scripts, now only *.sh files
are accepted. Suggested by Michael to spare future headaches caused by
backup files (theme.sh~ and the like)
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1550 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 2 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/init | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index fc6d2d39..4aa9cef4 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -557,7 +557,7 @@ fi runinithook () { local hook=$1 if [ -d /etc/init-hooks/$hook ]; then - for hook_script in /etc/init-hooks/$hook/*; do + for hook_script in /etc/init-hooks/$hook/*.sh; do . $hook_script done fi diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index 28a98459..cef0206e 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -789,8 +789,8 @@ fi runinithook '70-before-plugins' # check for any plugin-specific runlevel scripts and run them, if found: -if [ -d /initramfs/plugin-init.d ]; then - for plugin_starter in /initramfs/plugin-init.d/*; do +if [ -d /etc/plugin-init.d ]; then + for plugin_starter in /etc/plugin-init.d/*.sh; do [ $DEBUGLEVEL -gt 0 ] \ && echo "Running plugin starter $plugin_starter ..." . $plugin_starter |