diff options
| author | Jouke Witteveen <j.witteveen@gmail.com> | 2012-08-08 12:31:24 +0200 |
|---|---|---|
| committer | Jouke Witteveen <j.witteveen@gmail.com> | 2012-08-08 13:16:31 +0200 |
| commit | 0b35da2fde29d7cafceb205523df130903645b72 (patch) | |
| tree | 367e8937f177386642bb06002b6f54988f874bcc | |
| parent | 1dd23ef9398433b38c488b6ef24660a8931be870 (diff) | |
| download | netctl-0b35da2fde29d7cafceb205523df130903645b72.tar.gz netctl-0b35da2fde29d7cafceb205523df130903645b72.tar.xz | |
End initscripts compatibility
The recent ovrhaul of rc.conf in initscripts is a good point to enforce using the proper configuration files for netcfg as well.
| -rwxr-xr-x | src/hooks/initscripts | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/hooks/initscripts b/src/hooks/initscripts index 06d467c..07003c8 100755 --- a/src/hooks/initscripts +++ b/src/hooks/initscripts @@ -1,21 +1,8 @@ # Use initscripts output formatting. # This hook must be loaded after 'fancy'. -# At some point, this can be removed. Configuration through rc.conf is -# than still possible for initscripts users as a side effect. -if [[ -f /etc/rc.conf ]]; then - . /etc/rc.conf - if ! checkyesno $WARNED && - [[ ${NETWORKS+x} = x || ${WIRED_INTERFACE+x} = x || - ${WIRELESS_INTERFACE+x} = x || ${AUTO_PROFILES+x} = x ]]; then - report_err "Using /etc/rc.conf for netcfg settings is deprecated. - Use /etc/conf.d/netcfg instead." - export WARNED=yes - fi -fi - [[ ${FANCY_NORMAL+x} = x && -f /etc/rc.d/functions ]] || return -#. /etc/rc.conf +. /etc/rc.conf . /etc/rc.d/functions |