From c8ce95eade35b61d243f1d965806c443eacee1a5 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 22 Sep 2016 18:59:31 +0200 Subject: [PATCH] net/intel-em: use upcoming rc.loader for loader.conf contents We can also automate by checking for existence of src/etc/rc.loader.d and push to post-install and post-deinstall (yes, post, file must be removed to generate the correct loader.conf), but that's a minor thing for later. :) --- net/intel-em/+POST_DEINSTALL | 1 + net/intel-em/+POST_INSTALL | 7 +------ net/intel-em/+PRE_DEINSTALL | 5 ----- net/intel-em/Makefile | 2 +- net/intel-em/src/etc/rc.loader.d/50-intel-em | 1 + 5 files changed, 4 insertions(+), 12 deletions(-) create mode 100644 net/intel-em/+POST_DEINSTALL delete mode 100644 net/intel-em/+PRE_DEINSTALL create mode 100644 net/intel-em/src/etc/rc.loader.d/50-intel-em diff --git a/net/intel-em/+POST_DEINSTALL b/net/intel-em/+POST_DEINSTALL new file mode 100644 index 000000000..b1d89995e --- /dev/null +++ b/net/intel-em/+POST_DEINSTALL @@ -0,0 +1 @@ +/usr/local/etc/rc.loader diff --git a/net/intel-em/+POST_INSTALL b/net/intel-em/+POST_INSTALL index 4a5bf7b67..b1d89995e 100644 --- a/net/intel-em/+POST_INSTALL +++ b/net/intel-em/+POST_INSTALL @@ -1,6 +1 @@ -echo "Updating /boot/loader.conf" -touch /boot/loader.conf -cp /boot/loader.conf /boot/loader.conf.bak -(grep -v if_em_updated_load /boot/loader.conf.bak; \ - echo 'if_em_updated_load="YES"') > /boot/loader.conf -rm -f /boot/loader.conf.bak +/usr/local/etc/rc.loader diff --git a/net/intel-em/+PRE_DEINSTALL b/net/intel-em/+PRE_DEINSTALL deleted file mode 100644 index 7f4e685c8..000000000 --- a/net/intel-em/+PRE_DEINSTALL +++ /dev/null @@ -1,5 +0,0 @@ -echo "Updating /boot/loader.conf" -touch /boot/loader.conf -cp /boot/loader.conf /boot/loader.conf.bak -(grep -v if_em_updated_load /boot/loader.conf.bak) > /boot/loader.conf -rm -f /boot/loader.conf.bak diff --git a/net/intel-em/Makefile b/net/intel-em/Makefile index 7ee6e4176..d5f301f4b 100644 --- a/net/intel-em/Makefile +++ b/net/intel-em/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= intel-em -PLUGIN_VERSION= 1.1 +PLUGIN_VERSION= 1.2 PLUGIN_COMMENT= Intel Gigabit Base Driver PLUGIN_DEPENDS= intel-em-kmod PLUGIN_MAINTAINER= ad@opnsense.org diff --git a/net/intel-em/src/etc/rc.loader.d/50-intel-em b/net/intel-em/src/etc/rc.loader.d/50-intel-em new file mode 100644 index 000000000..2eb36f58d --- /dev/null +++ b/net/intel-em/src/etc/rc.loader.d/50-intel-em @@ -0,0 +1 @@ +if_em_updated_load="YES"