diff options
| author | Michael Janczyk | 2012-12-04 18:32:15 +0100 |
|---|---|---|
| committer | Michael Janczyk | 2012-12-04 18:32:15 +0100 |
| commit | 77ff585ab48626ade2d312102ae98202bf8b8d98 (patch) | |
| tree | 28511182974acfdcb2f47eb02756f0b180b6189e /src/initramfs/scripts/init | |
| parent | iPXE fixes (diff) | |
| download | core-77ff585ab48626ade2d312102ae98202bf8b8d98.tar.gz core-77ff585ab48626ade2d312102ae98202bf8b8d98.tar.xz core-77ff585ab48626ade2d312102ae98202bf8b8d98.zip | |
- respect blacklisting of modules when autoloading modules in hwautocfg '-b' (stage3).
- preinit.local enabled again for config/systemName/default, until now it was only possible for the default system in config/default. It make no sense for client specific configurations though.
Diffstat (limited to 'src/initramfs/scripts/init')
| -rwxr-xr-x | src/initramfs/scripts/init | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/initramfs/scripts/init b/src/initramfs/scripts/init index 3f41d3c6..d1d7945b 100755 --- a/src/initramfs/scripts/init +++ b/src/initramfs/scripts/init @@ -121,8 +121,12 @@ runinithook '00-started' # run pre init script and user defined preinit.local, copied by mkdxsinitrd # from /var/lib/openslx/config/... in stage2 preinit -[ -x /bin/preinit.local ] && /bin/preinit.local - +[ -f /bin/preinit.local ] && { + [ $DEBUGLEVEL -gt 0 ] && \ + echo -n "Running script /bin/preinit.local ... " + chmod u+x /bin/preinit.local + /bin/preinit.local + [ $DEBUGLEVEL -gt 0 ] && echo "ok"; } # switch off the several configuration methods, will be switched on # according to kernel commandline settings |