move also functions to /lib/rc-scripts (symlink preserved)

svn-id: @12336

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 46d7bc7de4141612e46251546b91815917d2f16d..22d17fb5c76e4071f9ea382affb03b07052f32ae 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,9 +6,10 @@ sbin_SCRIPTS = \
        tnldown \
        tnlup
 
-networkscriptsdir = @networkscriptsdir@
+#scriptsdir = @networkscriptsdir@
+scriptsdir = @exec_prefix@/lib/$(PACKAGE)
 
-networkscripts_SCRIPTS = \
+scripts_SCRIPTS = \
        ifdown-br \
        ifdown-irda \
        ifdown-ppp \
@@ -29,18 +30,12 @@ networkscripts_SCRIPTS = \
        ifup-sl \
        ifup-vlan
 
-networkscripts_DATA = \
+scripts_DATA = \
+       functions \
        functions.network
 
-#SUBDIRS = data
-
-interfacesdir = @sysconfigdir@/interfaces
-
-interfaces_DATA =
-
 EXTRA_DIST = \
-       $(interfaces_DATA) \
        $(sbin_SCRIPTS) \
-       $(networkscripts_SCRIPTS) \
-       $(networkscripts_DATA)
+       $(scripts_SCRIPTS) \
+       $(scripts_DATA)
 

diff --git a/rc.d/init.d/functions b/lib/functions
similarity index 100%
rename from rc.d/init.d/functions
rename to lib/functions

diff --git a/po/rc-scripts.pot b/po/rc-scripts.pot
index ce31b59b7c0094ca1b37a8230ae78f91401e6349..1b169bde03351b976edc180af1b143a5108973ba 100644 (file)
--- a/po/rc-scripts.pot
+++ b/po/rc-scripts.pot
@@ -17,7 +17,7 @@ msgstr ""
 # (4 + "\b" * count of letters) in one of five previous words
 # msgid "\b\b\b\b\b\b\b\b"
 
-#: .././rc.d/init.d/functions:911
+#: .././lib/functions:911
 msgid "%s (pid %s) is running%s"
 msgstr ""
 
@@ -37,20 +37,20 @@ msgstr ""
 msgid "Reloading interface %s"
 msgstr ""
 
+#: .././rc.d/rc.shutdown:82
 #: .././rc.d/rc.sysinit:133
 #: .././rc.d/rc.sysinit:146
 #: .././rc.d/rc.sysinit:704
 #: .././rc.d/rc.sysinit:747
 #: .././rc.d/rc.sysinit:810
-#: .././rc.d/rc.shutdown:82
 msgid "Unmounting file systems"
 msgstr ""
 
-#: .././rc.d/init.d/functions:1157
+#: .././lib/functions:1157
 msgid "WORK"
 msgstr ""
 
-#: .././rc.d/init.d/functions:931
+#: .././lib/functions:931
 msgid "%s is stopped"
 msgstr ""
 
@@ -58,10 +58,10 @@ msgstr ""
 msgid "The $_rebootwhat is halted"
 msgstr ""
 
+#: .././rc.d/rc.shutdown:113
 #: .././rc.d/rc.sysinit:705
 #: .././rc.d/rc.sysinit:748
 #: .././rc.d/rc.sysinit:811
-#: .././rc.d/rc.shutdown:113
 msgid "Remounting root filesystem in ro mode"
 msgstr ""
 
@@ -102,16 +102,16 @@ msgstr ""
 msgid "Initializing USB keyboard"
 msgstr ""
 
-#: .././rc.d/init.d/local:25
+#: .././rc.d/init.d/local:27
 msgid "rc.local has been started"
 msgstr ""
 
-#: .././rc.d/init.d/network:200
-msgid "Bringing up interface %s"
+#: .././lib/functions:370
+msgid "%s service is not running."
 msgstr ""
 
-#: .././rc.d/init.d/functions:370
-msgid "%s service is not running."
+#: .././rc.d/init.d/network:200
+msgid "Bringing up interface %s"
 msgstr ""
 
 #: .././rc.d/init.d/netfs:150
@@ -138,7 +138,7 @@ msgstr ""
 msgid "*** Filesystem was repaired but system needs to be"
 msgstr ""
 
-#: .././rc.d/init.d/functions:921
+#: .././lib/functions:921
 msgid "%s dead but pid file (%s) exists"
 msgstr ""
 
@@ -150,22 +150,22 @@ msgstr ""
 msgid "Setting up Logical Volume Management"
 msgstr ""
 
+#: .././lib/functions:1112
+msgid "Unmounting loopback filesystems (retry):"
+msgstr ""
+
 #: .././rc.d/rc.shutdown:62
 msgid "Turning off quotas for local filesystems"
 msgstr ""
 
-#: .././rc.d/init.d/functions:1112
-msgid "Unmounting loopback filesystems (retry):"
+#: .././lib/functions:506
+msgid "$message"
 msgstr ""
 
 #: .././rc.d/rc:92
 msgid "Entering non-interactive startup"
 msgstr ""
 
-#: .././rc.d/init.d/functions:506
-msgid "$message"
-msgstr ""
-
 #: .././lib/ifup:234
 msgid "Enabling proxy ARP on %s"
 msgstr ""
@@ -204,27 +204,27 @@ msgstr ""
 msgid "Unmounting network block filesystems"
 msgstr ""
 
+#: .././lib/functions:994
+msgid "Loading %s kernel module(s)"
+msgstr ""
+
 #: .././rc.d/rc.sysinit:561
 msgid "Activating ATARAID devices"
 msgstr ""
 
-#: .././rc.d/init.d/network:344
-msgid "Configured devices:"
+#: .././rc.d/init.d/single:27
+#: .././rc.d/rc.shutdown:49
+msgid "Sending all processes the KILL signal"
 msgstr ""
 
-#: .././rc.d/init.d/functions:994
-msgid "Loading %s kernel module(s)"
+#: .././rc.d/init.d/network:344
+msgid "Configured devices:"
 msgstr ""
 
 #: .././rc.d/init.d/netfs:158
 msgid "Active CIFS mountpoints: "
 msgstr ""
 
-#: .././rc.d/init.d/single:27
-#: .././rc.d/rc.shutdown:49
-msgid "Sending all processes the KILL signal"
-msgstr ""
-
 #: .././lib/ifup-vlan:56
 msgid "VLAN kernel support is missing. Can't continue."
 msgstr ""
@@ -269,14 +269,14 @@ msgstr ""
 msgid "*** rebooted before mounting it."
 msgstr ""
 
-#: .././rc.d/init.d/network:234
-msgid "Shutting down bridge interface %s"
-msgstr ""
-
 #: .././rc.d/init.d/netfs:50
 msgid "Mounting CIFS filesystems"
 msgstr ""
 
+#: .././rc.d/init.d/network:234
+msgid "Shutting down bridge interface %s"
+msgstr ""
+
 #: .././rc.d/init.d/netfs:115
 msgid "Unmounting network block filesystems (retry)"
 msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
 msgid "Delay login is not enabled"
 msgstr ""
 
-#: .././rc.d/init.d/functions:928
+#: .././lib/functions:928
 msgid "daemon %s dead but subsys (%s) locked"
 msgstr ""
 
@@ -356,7 +356,7 @@ msgstr ""
 msgid "Activating LVM volume groups"
 msgstr ""
 
-#: .././rc.d/init.d/functions:1109
+#: .././lib/functions:1109
 msgid "Unmounting loopback filesystems: "
 msgstr ""
 
@@ -369,7 +369,7 @@ msgstr ""
 msgid "%s does not exist, perhaps set $CHATSCRIPT"
 msgstr ""
 
-#: .././rc.d/init.d/functions:358
+#: .././lib/functions:358
 msgid "Starting %s service"
 msgstr ""
 
@@ -381,6 +381,10 @@ msgstr ""
 msgid "Scanning for LVM volume groups"
 msgstr ""
 
+#: .././lib/functions:938
+msgid "Start service %s (Y)es/(N)o/(C)ontinue? [Y] "
+msgstr ""
+
 #: .././lib/ifdown-vlan:46
 #: .././lib/ifup-vlan:77
 msgid "/sbin/vconfig or iproute2 with vlan support is missing. Can't continue."
@@ -390,19 +394,15 @@ msgstr ""
 msgid "Setting static RARP entries"
 msgstr ""
 
-#: .././rc.d/init.d/network:346
-msgid "Configured tunnels:"
-msgstr ""
-
 #: .././rc.d/init.d/network:230
 msgid "Removing tunnel %s"
 msgstr ""
 
-#: .././rc.d/init.d/functions:938
-msgid "Start service %s (Y)es/(N)o/(C)ontinue? [Y] "
+#: .././rc.d/init.d/network:346
+msgid "Configured tunnels:"
 msgstr ""
 
-#: .././rc.d/init.d/functions:362
+#: .././lib/functions:362
 msgid "%s service is already running."
 msgstr ""
 
@@ -414,12 +414,12 @@ msgstr ""
 msgid "Users cannot control this device."
 msgstr ""
 
-#: .././rc.d/init.d/netfs:124
-msgid "Unmounting CIFS filesystems"
+#: .././lib/functions:354
+msgid "ERROR: Networking is down. %s can't be run."
 msgstr ""
 
-#: .././rc.d/init.d/functions:354
-msgid "ERROR: Networking is down. %s can't be run."
+#: .././rc.d/init.d/netfs:124
+msgid "Unmounting CIFS filesystems"
 msgstr ""
 
 #: .././lib/ifup-sl:55
@@ -450,7 +450,7 @@ msgstr ""
 msgid "\t\t  Press %sI%s to enter interactive startup"
 msgstr ""
 
-#: .././rc.d/init.d/functions:906
+#: .././lib/functions:906
 msgid " in cpuset %s..."
 msgstr ""
 
@@ -470,20 +470,20 @@ msgstr ""
 msgid "Checking encrypted filesystems"
 msgstr ""
 
-#: .././rc.d/init.d/functions:1156
 #: .././rc.d/rc:149
+#: .././lib/functions:1156
 msgid "DONE"
 msgstr ""
 
+#: .././lib/functions:487
+msgid "username"
+msgstr ""
+
 #: .././rc.d/rc.sysinit:499
 #: .././rc.d/rc.sysinit:501
 msgid "Finding module dependencies"
 msgstr ""
 
-#: .././rc.d/init.d/functions:487
-msgid "username"
-msgstr ""
-
 #: .././rc.d/rc:89
 msgid "Entering interactive startup"
 msgstr ""
@@ -516,8 +516,8 @@ msgstr ""
 msgid "Automatic reboot in progress"
 msgstr ""
 
-#: .././rc.d/rc.shutdown:194
-msgid "Will now restart with kexec"
+#: .././rc.d/rc.sysinit:838
+msgid "Checking filesystem quotas"
 msgstr ""
 
 #: .././rc.d/rc.shutdown:171
@@ -525,20 +525,20 @@ msgstr ""
 msgid "On the next boot fsck will be skipped."
 msgstr ""
 
-#: .././rc.d/rc.sysinit:838
-msgid "Checking filesystem quotas"
+#: .././rc.d/rc.shutdown:194
+msgid "Will now restart with kexec"
 msgstr ""
 
 #: .././rc.d/rc.sysinit:311
 msgid "Initializing USB controller"
 msgstr ""
 
-#: .././rc.d/rc.sysinit:653
-msgid "Starting up RAID device %s"
+#: .././lib/functions:1080
+msgid "$3"
 msgstr ""
 
-#: .././rc.d/init.d/functions:1080
-msgid "$3"
+#: .././rc.d/rc.sysinit:653
+msgid "Starting up RAID device %s"
 msgstr ""
 
 #: .././rc.d/init.d/cryptsetup:63
@@ -568,12 +568,12 @@ msgstr ""
 msgid "%s: no value for hash option, skipping"
 msgstr ""
 
-#: .././rc.d/rc.sysinit:384
-msgid "Setting up ISA PNP devices (userspace pnp)"
+#: .././lib/functions:366
+msgid "Stopping %s service"
 msgstr ""
 
-#: .././rc.d/init.d/functions:366
-msgid "Stopping %s service"
+#: .././rc.d/rc.sysinit:384
+msgid "Setting up ISA PNP devices (userspace pnp)"
 msgstr ""
 
 #: .././rc.d/rc.sysinit:582
@@ -591,24 +591,24 @@ msgstr ""
 msgid "*** An error occurred during the file system check."
 msgstr ""
 
-#: .././rc.d/rc.sysinit:817
-msgid "Remounting encrypted filesystems back in rw mode"
+#: .././lib/functions:1082
+msgid "$4"
 msgstr ""
 
-#: .././rc.d/init.d/functions:1082
-msgid "$4"
+#: .././rc.d/rc.sysinit:817
+msgid "Remounting encrypted filesystems back in rw mode"
 msgstr ""
 
 #: .././rc.d/init.d/cryptsetup:176
 msgid "dm-crypt module is not loaded"
 msgstr ""
 
-#: .././lib/ifup-sl:92
-msgid "slattach started for %s on %s at %s"
+#: .././lib/functions:1117
+msgid "Detaching loopback device $dev: "
 msgstr ""
 
-#: .././rc.d/init.d/functions:1117
-msgid "Detaching loopback device $dev: "
+#: .././lib/ifup-sl:92
+msgid "slattach started for %s on %s at %s"
 msgstr ""
 
 #: .././rc.d/init.d/network:229
@@ -635,7 +635,7 @@ msgstr ""
 msgid "Initializing firewire controller"
 msgstr ""
 
-#: .././rc.d/init.d/functions:418
+#: .././lib/functions:418
 msgid "$1"
 msgstr ""
 
@@ -647,7 +647,7 @@ msgstr ""
 msgid "Checking filesystems"
 msgstr ""
 
-#: .././rc.d/init.d/functions:378
+#: .././lib/functions:378
 msgid "Usage: %s"
 msgstr ""
 
@@ -677,16 +677,6 @@ msgstr ""
 msgid "dm-crypt module is loaded"
 msgstr ""
 
-#: .././rc.d/rc.sysinit:632
-#: .././rc.d/rc.sysinit:688
-#: .././rc.d/rc.sysinit:716
-msgid "Starting up RAID devices"
-msgstr ""
-
-#: .././rc.d/rc.sysinit:435
-msgid "System bootup in progress - please wait"
-msgstr ""
-
 #: .././rc.d/init.d/allowlogin:28
 msgid "Allowing users to login"
 msgstr ""
@@ -695,8 +685,14 @@ msgstr ""
 msgid "Checking root filesystem"
 msgstr ""
 
-#: .././rc.d/init.d/cpusets:168
-msgid "Configured cpusets:"
+#: .././rc.d/rc.sysinit:435
+msgid "System bootup in progress - please wait"
+msgstr ""
+
+#: .././rc.d/rc.sysinit:632
+#: .././rc.d/rc.sysinit:688
+#: .././rc.d/rc.sysinit:716
+msgid "Starting up RAID devices"
 msgstr ""
 
 #: .././rc.d/init.d/cpusets:105
@@ -704,36 +700,44 @@ msgstr ""
 msgid "$("
 msgstr ""
 
-#: .././rc.d/rc.sysinit:948
-msgid "Enabling swap space"
+#: .././rc.d/init.d/cpusets:168
+msgid "Configured cpusets:"
 msgstr ""
 
-#: .././rc.d/init.d/functions:386
+#: .././lib/functions:386
 msgid "$@"
 msgstr ""
 
+#: .././rc.d/rc.sysinit:948
+msgid "Enabling swap space"
+msgstr ""
+
 #: .././rc.d/rc.sysinit:389
 msgid "Setting up ISA PNP devices (kernelspace pnp)"
 msgstr ""
 
-#: .././rc.d/init.d/functions:1011
+#: .././lib/functions:1159
+msgid "DIED"
+msgstr ""
+
+#: .././lib/functions:1011
 msgid "Could not load %s kernel module(s)"
 msgstr ""
 
-#: .././rc.d/init.d/functions:1159
-msgid "DIED"
+#: .././rc.d/init.d/single:25
+#: .././rc.d/rc.shutdown:43
+msgid "Sending all processes the TERM signal"
 msgstr ""
 
 #: .././rc.d/init.d/single:53
 msgid "Telling INIT to go to single user mode"
 msgstr ""
 
-#: .././rc.d/init.d/single:25
-#: .././rc.d/rc.shutdown:43
-msgid "Sending all processes the TERM signal"
+#: .././lib/functions:1382
+msgid "$command not implemented for $name"
 msgstr ""
 
-#: .././rc.d/init.d/functions:374
+#: .././lib/functions:374
 msgid "Reloading %s service"
 msgstr ""
 
@@ -741,22 +745,22 @@ msgstr ""
 msgid "Unmounting NCP filesystems"
 msgstr ""
 
-#: .././rc.d/init.d/functions:1382
-msgid "$command not implemented for $name"
+#: .././rc.d/init.d/allowlogin:35
+msgid "System shutdown in progress\n"
 msgstr ""
 
-#: .././rc.d/init.d/local:27
+#: .././rc.d/init.d/local:29
 msgid "rc.local has not been started"
 msgstr ""
 
-#: .././rc.d/init.d/allowlogin:35
-msgid "System shutdown in progress\n"
-msgstr ""
-
 #: .././rc.d/rc.sysinit:433
 msgid "Enabling Delay Login"
 msgstr ""
 
+#: .././lib/functions:1155
+msgid "BUSY"
+msgstr ""
+
 #: .././lib/ifdown-irda:69
 msgid "ifdown-%s unable to kill %s for %s"
 msgstr ""
@@ -765,10 +769,6 @@ msgstr ""
 msgid "$src: No such device"
 msgstr ""
 
-#: .././rc.d/init.d/functions:1155
-msgid "BUSY"
-msgstr ""
-
 #: .././rc.d/init.d/cryptsetup:105
 msgid "%s: LUKS requires non-random key, skipping"
 msgstr ""
@@ -783,14 +783,14 @@ msgstr ""
 msgid "Today`s date:"
 msgstr ""
 
-#: .././rc.d/init.d/allowlogin:43
-msgid "Delay login is enabled"
-msgstr ""
-
 #: .././rc.d/init.d/network:208
 msgid "Setting tunnel %s"
 msgstr ""
 
+#: .././rc.d/init.d/allowlogin:43
+msgid "Delay login is enabled"
+msgstr ""
+
 #: .././rc.d/init.d/network:349
 msgid "Currently inactive devices and tunnels:"
 msgstr ""
@@ -810,11 +810,11 @@ msgstr ""
 msgid "%s: options are invalid for LUKS partitions, ignoring them"
 msgstr ""
 
-#: .././rc.d/init.d/functions:570
+#: .././lib/functions:570
 msgid "warning: --check option is ignored!"
 msgstr ""
 
-#: .././rc.d/init.d/functions:908
+#: .././lib/functions:908
 msgid " outside of configured cpuset %s..."
 msgstr ""
 
@@ -822,15 +822,15 @@ msgstr ""
 msgid "Active network block devices: "
 msgstr ""
 
+#: .././lib/functions:1158
+msgid "FAIL"
+msgstr ""
+
 #: .././lib/functions.network:137
 #: .././lib/functions.network:139
 msgid "Setting static ARP entries"
 msgstr ""
 
-#: .././rc.d/init.d/functions:1158
-msgid "FAIL"
-msgstr ""
-
 #: .././rc.d/init.d/allowlogin:48
 msgid "Users are not allowed to login right now"
 msgstr ""
@@ -860,14 +860,14 @@ msgstr ""
 msgid "ifup-sl - %s exiting"
 msgstr ""
 
-#: .././rc.d/rc.sysinit:403
-msgid "Checking root filesystem quotas"
-msgstr ""
-
 #: .././rc.d/init.d/network:51
 msgid "Setting interfaces names (nameif)"
 msgstr ""
 
+#: .././rc.d/rc.sysinit:403
+msgid "Checking root filesystem quotas"
+msgstr ""
+
 #: .././lib/ifup:179
 #: .././lib/ifup:184
 msgid "Determining IP information for %s (%s)"

diff --git a/rc.d/init.d/Makefile.am b/rc.d/init.d/Makefile.am
index b1caa3e9bd6fc33a93bad8c054b4c75b4e75814f..df44ba9999cdd5e7429dd3e7e9f38e676158a6a9 100644 (file)
--- a/rc.d/init.d/Makefile.am
+++ b/rc.d/init.d/Makefile.am
@@ -14,12 +14,12 @@ init_SCRIPTS = \
        cryptsetup \
        local
 
-init_DATA = functions
-
 EXTRA_DIST = $(init_SCRIPTS) $(init_DATA)
 
 install-data-hook: all
        $(LN_S) $(initdir) $(DESTDIR)$(sysconfdir)/init.d
+       $(LN_S) /lib/rc-scripts/functions $(DESTDIR)$(initdir)/functions
 
 uninstall-hook:
        rm -f $(DESTDIR)$(sysconfdir)/init.d
+       rm -f $(DESTDIR)$(sysconfdir)/init.d/functions