Rename files to remove the deprecated gf- prefix

sharedconf/Makefile.am

@@ -4,10 +4,10 @@ sysvinitdir = $(sysconfdir)/init.d/
 systemdunitdir = $(libdir)/systemd/system/
 
 dist_sbin_SCRIPTS = \
-	gf-conf-reader.sh \
-	gf-functions.sh \
-	gf-network-conf.sh \
-	gf-versions.sh \
+	conf-reader.sh \
+	seco-functions.sh \
+	network-conf.sh \
+	sys-versions.sh \
 	lan95xx-init-eeprom.sh \
 	lan95xx-set-mac.sh \
 	lan95xx-set-serial.sh \
@@ -27,22 +27,23 @@ dist_udevrules_DATA = \
 	sharedconf.rules
 
 dist_sysvinit_DATA = \
-	gf-network-conf \
-	gf-shared-remount
+	generate-network-conf \
+	etc-shared-remount
 
 dist_systemdunit_DATA = \
-	gf-network-conf.service
+	generate-network-conf.service
 
 install-exec-hook:
 	cd $(DESTDIR)/$(sbindir)
-	$(LN_S) gf-conf-reader.sh $(DESTDIR)$(sbindir)/sconfig
-	$(LN_S) gf-versions.sh $(DESTDIR)$(sbindir)/showversion
+	$(LN_S) conf-reader.sh $(DESTDIR)$(sbindir)/sconfig
+	$(LN_S) sys-versions.sh $(DESTDIR)$(sbindir)/showversion
 
 install-data-hook:
 	cd $(DESTDIR)
-	$(LN_S) $(sbindir)/gf-versions.sh $(DESTDIR)/$(sysvinitdir)/showversion
+	$(LN_S) $(sbindir)/sys-versions.sh $(DESTDIR)/$(sysvinitdir)/showversion
+	$(LN_S) $(sbindir)/sys-versions.sh $(DESTDIR)/$(sbindir)/gf-versions.sh
 	mkdir -p $(DESTDIR)/$(sysconfdir)/shared
-	chmod +x $(DESTDIR)/$(sysvinitdir)/gf-network-conf
-	chmod +x $(DESTDIR)/$(sysvinitdir)/gf-shared-remount
+	chmod +x $(DESTDIR)/$(sysvinitdir)/generate-network-conf
+	chmod +x $(DESTDIR)/$(sysvinitdir)/etc-shared-remount
 
 

sharedconf/gf-conf-reader.sh → sharedconf/conf-reader.sh

@@ -38,8 +38,8 @@ HELP="
 
 THISDIR="$(dirname "$(realpath "$0")")"
 
-# shellcheck source=./gf-functions.sh
-. "$THISDIR/gf-functions.sh"
+# shellcheck source=./seco-functions.sh
+. "$THISDIR/seco-functions.sh"
 
 # Default storage location
 CONFIG_XML="/etc/shared/config.xml"
@@ -341,8 +341,8 @@ auto_wwan()   { xml_setting 'auto_wwan' "$1";              }
 
 reload_network()
 {
-    gf-network-conf.sh generate
-    gf-network-conf.sh restart
+    network-conf.sh generate
+    network-conf.sh restart
 }
 
 list()

sharedconf/gf-network-conf → sharedconf/generate-network-conf

 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          gf-network-conf
+# Provides:          generate-network-conf
 # Required-Start:    $local_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      1
@@ -15,13 +15,13 @@
 
 case "$1" in
 start|restart)
-        gf-network-conf.sh generate -f ifupdown
-        gf-network-conf.sh apply-mac
+        network-conf.sh generate -f ifupdown
+        network-conf.sh apply-mac
         ;;
 stop)
         ;;
 *)
-        echo "Usage: /etc/init.d/gf-network-conf {start|stop}" >&2
+        echo "Usage: /etc/init.d/generate-network-conf {start|stop}" >&2
         exit 1
         ;;
 esac

sharedconf/gf-network-conf.service → sharedconf/generate-network-conf.service

@@ -11,14 +11,14 @@ Requires=etc-shared.mount
 [Service]
 Type=oneshot
 
-ExecStart=/usr/sbin/gf-network-conf.sh --format=networkd generate -v -v 
+ExecStart=/usr/sbin/network-conf.sh --format=networkd generate -v -v
 
 TimeoutSec=50
 Restart=on-failure
 
 StandardOutput=journal
 StandardError=journal
-SyslogIdentifier=gf-network-conf
+SyslogIdentifier=generate-network-conf
 
 [Install]
 WantedBy=network-pre.target multi-user.target

sharedconf/lan95xx-set-mac.sh

@@ -11,8 +11,8 @@ export HELP="
 
 THISDIR="$(dirname "$(realpath "$0")")"
 
-# shellcheck source=./gf-functions.sh
-. "$THISDIR/gf-functions.sh"
+# shellcheck source=./seco-functions.sh
+. "$THISDIR/seco-functions.sh"
 
 interface=$1
 shift

sharedconf/lan95xx-set-serial.sh

@@ -12,8 +12,8 @@ export HELP="
 
 THISDIR="$(dirname "$(realpath "$0")")"
 
-# shellcheck source=./gf-functions.sh
-. "$THISDIR/gf-functions.sh"
+# shellcheck source=./seco-functions.sh
+. "$THISDIR/seco-functions.sh"
 
 interface=$1
 serial="$2"

sharedconf/mac2serial.sh

@@ -8,8 +8,8 @@ export HELP="
 
 THISDIR="$(dirname "$(realpath "$0")")"
 
-# shellcheck source=./gf-functions.sh
-. "$THISDIR/gf-functions.sh"
+# shellcheck source=./seco-functions.sh
+. "$THISDIR/seco-functions.sh"
 
 parse_args "$@"; shift $?
 

sharedconf/mask2cidr.sh

@@ -9,8 +9,8 @@ export HELP="
 
 THISDIR="$(dirname "$(realpath "$0")")"
 
-# shellcheck source=./gf-functions.sh
-. "$THISDIR/gf-functions.sh"
+# shellcheck source=./seco-functions.sh
+. "$THISDIR/seco-functions.sh"
 
 parse_args "$@"; shift $?
 

sharedconf/gf-network-conf.sh → sharedconf/network-conf.sh

@@ -36,11 +36,11 @@ HELP="
 
 THISDIR="$(dirname "$(realpath "$0")")"
 
-# shellcheck source=./gf-functions.sh
-. "$THISDIR/gf-functions.sh"
+# shellcheck source=./seco-functions.sh
+. "$THISDIR/seco-functions.sh"
 
 # Default storage location
-GF_CONF="${THISDIR}/gf-conf-reader.sh"
+GF_CONF="${THISDIR}/conf-reader.sh"
 
 NETWORKMANAGER_CONFIG_FILEPATTERN="Wired connection %s.nmconnection"
 NETWORKMANAGER_CONFIG_PATH="/etc/NetworkManager/system-connections/"

sharedconf/seco-fuse-reader.sh

@@ -12,8 +12,8 @@ HELP="
 
 THISDIR="$(dirname "$(realpath "$0")")"
 
-# shellcheck source=./gf-functions.sh
-. "$THISDIR/gf-functions.sh"
+# shellcheck source=./seco-functions.sh
+. "$THISDIR/seco-functions.sh"
 
 
 

sharedconf/serial2mac.sh

@@ -8,8 +8,8 @@ export HELP="
 
 THISDIR="$(dirname "$(realpath "$0")")"
 
-# shellcheck source=./gf-functions.sh
-. "$THISDIR/gf-functions.sh"
+# shellcheck source=./seco-functions.sh
+. "$THISDIR/seco-functions.sh"
 
 parse_args "$@"; shift $?
 

sharedconf/gf-versions.sh → sharedconf/sys-versions.sh

@@ -43,8 +43,8 @@ HELP="
 
 THISDIR="$(dirname "$(realpath "$0")")"
 
-# shellcheck source=./gf-functions.sh
-. "$THISDIR/gf-functions.sh"
+# shellcheck source=./seco-functions.sh
+. "$THISDIR/seco-functions.sh"
 
 # Default function
 FUNCTION=list